merge from default branch

author: Yann Leboulanger <asterix@lagaule.org> 2010-01-19 18:37:14 +0300
committer: Yann Leboulanger <asterix@lagaule.org> 2010-01-19 18:37:14 +0300
commit: 3a76966c1462bcd65cee534a06dad4c9fc7cc494 (patch)
tree: b9b4b257e02f9db2d209ec42ea57b481f1239ef5
parent: b38249c4066cf883ceb347b15410d32bd7e3357b (diff)
parent: daf73408d7dbd5324cab1ad7ea4aaec2cb696aaa (diff)
293 files changed, 76576 insertions, 71670 deletions
diff --git a/.hgignore b/.hgignore
index 1f56821c2..962a2aafb 100644
--- a/.hgignore
+++ b/.hgignore
@@ -2,13 +2,9 @@ syntax: glob
 *.orig
 *.gmo
 *.in
-*.la
-*.lo
 *.m4
 *.pyc
 *.pyo
-*.o
-*.Plo
 *~
 autom4te.cache
 data/defs.py
@@ -23,6 +19,4 @@ Makefile
 syntax: regexp
 ^config\.*
 ^config\/
-^src\/\.libs
-^src\/trayicon.c
 ^scripts\/gajim.*
diff --git a/AUTHORS b/AUTHORS
index a3cfefe88..3d1502324 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 CURRENT DEVELOPERS:
 
+Alexander Cherniuk (ts33kr AT gmail.com)
 Nikos Kouremenos (kourem AT gmail.com)
 Yann Leboulanger (asterix AT lagaule.org)
 Julien Pivotto (roidelapluie AT gmail.com)
diff --git a/ChangeLog b/ChangeLog
index 6f77eb6d3..9cea195b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,7 +44,7 @@ Gajim 0.12.2 (07 June 2009)
   * Improve error messages handling
   * Totem support for played music
   * Fix SSL with some servers
-  * Handle XFCE notification-daemon
+  * Handle Xfce notification-daemon
   * Restore old behaviour of click on systray: left click to open events
   * Network manager 0.7 support
   * Move logs file under windows to $APPDATA/gajim
diff --git a/Makefile.am b/Makefile.am
index 019f7a1d9..4e70251bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src data po
+SUBDIRS = src data po icons
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -50,7 +50,6 @@ MAINTAINERCLEANFILES = \
 	aclocal.m4 \
 	libtool \
 	po/POTFILES.in \
-	src/trayicon_la-eggtrayicon.loT \
 	m4/intltool.m4
 
 MAINTAINERCLEANDIRS = \
diff --git a/README.html b/README.html
index 558d23a80..b648af9c0 100644
--- a/README.html
+++ b/README.html
@@ -4,27 +4,23 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
  <title>Gajim - Read Me</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 </head>
 <body>
 
 <h1>Gajim Read Me</h1>
 
-<p>
-Welcome to Gajim and thank you for trying out our client.
-</p>
+<p>Welcome to Gajim and thank you for trying out our client.</p>
 
 <h2>Runtime Requirements</h2>
 <ul>
 <li>python2.5 or higher</li>
-<li>pygtk2.12 or higher</li>
+<li>pygtk2.16 or higher</li>
 <li>python-libglade</li>
 <li>pysqlite2 (if you have python 2.5, you already have this)</li>
 </ul>
 
-<p>
-<strong>Note to packagers</strong>
-Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration.
-</p>
+<p><strong>Note to packagers</strong> Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration.</p>
 
 <h2>Optional Runtime Requirements</h2>
 <ul>
@@ -34,34 +30,23 @@ Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gno
 <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
 <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
 <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
-<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li>
 <li>gnome-python-desktop (for GnomeKeyring support)</li>
 <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
 <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
-<li>python-dbus bindings (>=0.80)</li>
-<li>python-sexy to have clickable URLs in chat windows</li>
+<li>python-dbus bindings (>=0.81)</li>
 <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
 </ul>
 
-<p>
-Some distributions also split too much python standard library.
-I know SUSE does. In such distros you also need python-xml
-the xml lib that *comes* with python and not pyxml or whatever.
-</p>
+<p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p>
 
 <h2>Compile-time Requirements</h2>
 <ul>
 <li>python-dev</li>
 <li>python-gtk2-dev</li>
-<li>libgtk2.0-dev aka. gtk2-devel</li>
-<li>libgtkspell-dev	(for the gtkspell module)</li>
 <li>intltool (>= 0.40.1)</li>
 </ul>
 
-<p>
-<strong>NOTE:</strong>
-If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.
-</p>
+<p><strong>NOTE:</strong> If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.</p>
 
 <h2>Installation Procedure</h2>
 <ol>
@@ -72,25 +57,22 @@ If you still have problems compiling, you may want to try removing the gtk1 seri
 <li>su -c make install</li>
 </ol>
 
-<p>
-To specify what modules to build do:
-make help
-</p>
+<p>To specify what modules to build do:</p>
+<pre>
+    make help
+</pre>
 
-<p>
-To specify where to install do:
-su -c make PREFIX=custom_path install
-</p>
+<p>To specify where to install do:</p>
+<pre>
+    su -c make PREFIX=custom_path install
+</pre>
 
 <h2>Running Gajim</h2>
-<p>
-Just do <em>gajim</em> or you can run Gajim from your GNOME/XFCE/KDE/whatever menus.<br/><br/>
-
-or if you didn't 'make install' you can also run from gajim folder with
-<em>./launch.sh</em></p>
+<p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/>
+or if you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p>
 <hr />
-<h3>Note for svn users</h3>
-You will need GNU autotools in order to install Gajim from svn. This includes: 
+<h3>Note for hg users</h3>
+<p>You will need GNU autotools in order to install Gajim from svn. This includes:</p>
 <ul>
 <li>automake &gt;= 1.8 </li>
 <li>autoconf &gt;= 2.59 </li>
@@ -98,45 +80,41 @@ You will need GNU autotools in order to install Gajim from svn. This includes:
 <li>intltool-0.40.1 </li>
 <li>pkgconfig &gt;= 0.19</li>
 </ul>
-</p>
-steps to compile gajim:
+<p>steps to compile gajim:</p>
 <pre>
     $ sh autogen.sh
     $ ./configure
     $ make
 </pre>
-Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual:
+<p>Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual:</p>
 <pre>
     $ ./configure
     $ make
 </pre>
 <h2>Uninstallation Procedure</h2>
-<p>
-su -c make uninstall<br/>
-this will try to remove Gajim from the default directories.
-If you want to remove it from custom directory provide it as:<br/>
-make PREFIX=custom_path uninstall
+<pre>
+    su -c make uninstall
+</pre>
+<p>this will try to remove Gajim from the default directories.
+If you want to remove it from custom directory provide it as:
 </p>
+<pre>
+    make PREFIX=custom_path uninstall
+</pre>
 
 <h2>Miscellaneous</h2>
 <h3>XML &amp; Debugging</h3>
-<p>
-If you want to see the xml stanzas and/or help us debugging 
+<p>If you want to see the xml stanzas and/or help us debugging 
 you're advised to enable verbose via advanced configuration window.
 If you don't want to make this permanent, execute gajim with --verbose
-everytime you want to have verbose output.
-</p>
+everytime you want to have verbose output.</p>
 
 <h3>FAQ/Wiki</h3>
-<p>
-FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/>
-Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a>
-</p>
+<p>FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/>
+Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a></p>
 
 
-<p>
-That is all, <strong>enjoy!</strong>
-</p>
+<p>That is all, <strong>enjoy!</strong></p>
 
 <p>
 <br/>
@@ -152,6 +130,5 @@ PS.
 We use original art and parts of sounds and other art from Psi, Gossip,
 Gnomebaker, Gaim and some icons from various gnome-icons
 (mostly Dropline Etiquette) we found at art.gnome.org
-If you think we're violating a license please inform us. Thank you.
-</p>
+If you think we're violating a license please inform us. Thank you.</p>
 </body></html>
diff --git a/THANKS.artists b/THANKS.artists
index 5cdff9134..7f8f24c99 100644
--- a/THANKS.artists
+++ b/THANKS.artists
@@ -1,10 +1,10 @@
 Anders Ström
 Christophe Got
 Dennis Craven
+Dmitry Korzhevin
 Guillaume Morin
 Gvorcek Spajreh
 Josef Vybíral
 Membris Khan
 Rederick Asher
 Jakub Szypulka
-
diff --git a/configure.ac b/configure.ac
index 6363cb90b..cddf791c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.13.0.1-dev],[http://trac.gajim.org/],[gajim])
+		[0.13.10.1-dev],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADER(config.h)
@@ -39,7 +39,7 @@ AM_NLS
 dnl ****
 dnl pygtk and gtk+
 dnl ****
-PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0])
+PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0])
 AC_SUBST(PYGTK_CFLAGS)
 AC_SUBST(PYGTK_LIBS)
 PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
@@ -50,23 +50,27 @@ if test "x$PYTHON" = "x:"; then
 	AC_MSG_ERROR([Python not found])
 fi
 
-dnl ****
-dnl tray icon
-dnl ****
-AC_ARG_ENABLE(trayicon,
-  [  --disable-trayicon      do not build trayicon module [default yes]],
-  enable_trayicon=$enableval, enable_trayicon=yes)
-test "x$enable_trayicon" = "xyes" && have_trayicon=true || have_trayicon=false
-AM_CONDITIONAL(BUILD_TRAYICON, $have_trayicon)
-
 ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
 AC_SUBST(ACLOCAL_AMFLAGS)
 
 AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 AC_SUBST([PYTHON_INCLUDES])
 
-AS_AC_EXPAND(DATADIR, "${datadir}")
-AS_AC_EXPAND(LIBDIR, "${libdir}")
+dnl ****
+dnl enable installation in python-2.x/site-packages/gajim
+dnl ****
+AC_ARG_ENABLE(site-packages,
+  [AS_HELP_STRING([--enable-site-packages],
+	[install gajim sources in PYTHONDIR/site-packages/gajim
+instead of DATADIR/gajim/src.])]
+,
+AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
+,
+AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])
+)
+
+AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}")
+AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}")
 AS_AC_EXPAND(DOCDIR, "${docdir}")
 AS_AC_EXPAND(LOCALEDIR, "${localedir}")
 
@@ -82,6 +86,7 @@ AC_CONFIG_FILES([
 	data/iconsets/Makefile
 	data/moods/Makefile
 	data/activities/Makefile
+	icons/Makefile
 	data/gajim.desktop.in
 	data/defs.py
 	src/Makefile
@@ -91,8 +96,12 @@ AC_CONFIG_FILES([
 	po/Makefile.in
 ])
 AC_OUTPUT
-echo " 
-***************************** 
-  Build features:
-    trayicon ......... ${have_trayicon}
+echo "
+*****************************
+  Installation:
+    Prefix ........... ${prefix}
+    Python modules ... ${GAJIM_SRCDIR}
+    Documentation .... ${DOCDIR}
+    Others ........... ${PKGDATADIR}
 *****************************"
+
diff --git a/data/Makefile.am b/data/Makefile.am
index 541dcc85e..65cfb1cf9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,7 +5,7 @@ desktopdir = $(datadir)/applications
 desktop_in_files = gajim.desktop.in.in 
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
-installdefsdir = $(pkgdatadir)/src/common
+installdefsdir = $(gajim_srcdir)/common
 installdefs_DATA = defs.py
 
 soundsdir = $(pkgdatadir)/data/sounds
diff --git a/data/activities/Makefile.am b/data/activities/Makefile.am
index ab1eb1751..a0f242a53 100644
--- a/data/activities/Makefile.am
+++ b/data/activities/Makefile.am
@@ -1,38 +1,4 @@
 activitiesdir = $(pkgdatadir)/data/activities
-
-activities_DATA = 
-
-ACTIVITIES_DIRS = **/**
-
-ACTIVITIES_FILES = **/**/{*.png,*.gif}
-
-
-install-data-local:
-	@for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \
-		if test -d $(srcdir)/$$d;then \
-			echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d"; \
-			$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d || exit 1; \
-		fi; \
-	done; \
-	for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \
-		if test -f $(srcdir)/$$f; then \
-			echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f"; \
-			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f || exit 1; \
-		fi; \
-	done; 
-
-dist-hook:
-	@for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \
-		if test -d $(srcdir)/$$d;then \
-			echo " $(mkdir_p) $(distdir)/$$d"; \
-			$(mkdir_p) $(distdir)/$$d || exit 1; \
-		fi; \
-	done; \
-	for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \
-		if test -f $(srcdir)/$$f; then \
-			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
-			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
-		fi; \
-	done;
+nobase_dist_activities_DATA = $(srcdir)/*/*/*
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/defs.py.in b/data/defs.py.in
index b59d5b481..10d7de3b4 100644
--- a/data/defs.py.in
+++ b/data/defs.py.in
@@ -2,7 +2,7 @@
 # do not edit it!
 docdir = "@DOCDIR@"
 
-datadir = "@DATADIR@"
+basedir = "@PKGDATADIR@"
 
 version = "@VERSION@"
 
diff --git a/data/emoticons/Makefile.am b/data/emoticons/Makefile.am
index 9835dcd6e..1415a2caf 100644
--- a/data/emoticons/Makefile.am
+++ b/data/emoticons/Makefile.am
@@ -1,38 +1,7 @@
 emoticonsdir = $(pkgdatadir)/data/emoticons
-
-emoticons_DATA = 
-
-EMOTICONS_DIRS = **
-
-EMOTICONS_FILES = **/{*.png,*.gif,emoticons.py}
-
-
-install-data-local:
-	@for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \
-		if test -d $(srcdir)/$$d;then \
-			echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \
-			$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \
-		fi; \
-	done; \
-	for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \
-		if test -f $(srcdir)/$$f; then \
-			echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \
-			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \
-		fi; \
-	done; 
-
-dist-hook:
-	@for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \
-		if test -d $(srcdir)/$$d;then \
-			echo " $(mkdir_p) $(distdir)/$$d"; \
-			$(mkdir_p) $(distdir)/$$d || exit 1; \
-		fi; \
-	done; \
-	for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \
-		if test -f $(srcdir)/$$f; then \
-			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
-			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
-		fi; \
-	done;
+nobase_dist_emoticons_DATA = \
+	$(srcdir)/*/*.png \
+	$(srcdir)/*/*.gif \
+	$(srcdir)/*/emoticons.py
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/emoticons/tango/alien.png b/data/emoticons/tango/alien.png
new file mode 100644
index 000000000..ca83124f8
--- /dev/null
+++ b/data/emoticons/tango/alien.png
diff --git a/data/emoticons/tango/angel.png b/data/emoticons/tango/angel.png
new file mode 100644
index 000000000..ad98a51ca
--- /dev/null
+++ b/data/emoticons/tango/angel.png
diff --git a/data/emoticons/tango/arrogant.png b/data/emoticons/tango/arrogant.png
new file mode 100644
index 000000000..42b85ff14
--- /dev/null
+++ b/data/emoticons/tango/arrogant.png
diff --git a/data/emoticons/tango/beer.png b/data/emoticons/tango/beer.png
new file mode 100644
index 000000000..e955770a3
--- /dev/null
+++ b/data/emoticons/tango/beer.png
diff --git a/data/emoticons/tango/bomb.png b/data/emoticons/tango/bomb.png
new file mode 100644
index 000000000..9f28ff03b
--- /dev/null
+++ b/data/emoticons/tango/bomb.png
diff --git a/data/emoticons/tango/clap.png b/data/emoticons/tango/clap.png
new file mode 100644
index 000000000..80b0ae1b2
--- /dev/null
+++ b/data/emoticons/tango/clap.png
diff --git a/data/emoticons/tango/confused.png b/data/emoticons/tango/confused.png
new file mode 100644
index 000000000..e1a76fc38
--- /dev/null
+++ b/data/emoticons/tango/confused.png
diff --git a/data/emoticons/tango/cowboy.png b/data/emoticons/tango/cowboy.png
new file mode 100644
index 000000000..35e71afc8
--- /dev/null
+++ b/data/emoticons/tango/cowboy.png
diff --git a/data/emoticons/tango/crying.png b/data/emoticons/tango/crying.png
new file mode 100644
index 000000000..016b82eb5
--- /dev/null
+++ b/data/emoticons/tango/crying.png
diff --git a/data/emoticons/tango/curl-lip.png b/data/emoticons/tango/curl-lip.png
new file mode 100644
index 000000000..bf12d34c8
--- /dev/null
+++ b/data/emoticons/tango/curl-lip.png
diff --git a/data/emoticons/tango/cute.png b/data/emoticons/tango/cute.png
new file mode 100644
index 000000000..ca6b4018a
--- /dev/null
+++ b/data/emoticons/tango/cute.png
diff --git a/data/emoticons/tango/dance.png b/data/emoticons/tango/dance.png
new file mode 100644
index 000000000..709701d9b
--- /dev/null
+++ b/data/emoticons/tango/dance.png
diff --git a/data/emoticons/tango/devil.png b/data/emoticons/tango/devil.png
new file mode 100644
index 000000000..3e043d07b
--- /dev/null
+++ b/data/emoticons/tango/devil.png
diff --git a/data/emoticons/tango/disapointed.png b/data/emoticons/tango/disapointed.png
new file mode 100644
index 000000000..b2aced9a3
--- /dev/null
+++ b/data/emoticons/tango/disapointed.png
diff --git a/data/emoticons/tango/doh.png b/data/emoticons/tango/doh.png
new file mode 100644
index 000000000..d5cd84cc8
--- /dev/null
+++ b/data/emoticons/tango/doh.png
diff --git a/data/emoticons/tango/dont-know.png b/data/emoticons/tango/dont-know.png
new file mode 100644
index 000000000..df2b647ca
--- /dev/null
+++ b/data/emoticons/tango/dont-know.png
diff --git a/data/emoticons/tango/embarrassed.png b/data/emoticons/tango/embarrassed.png
new file mode 100644
index 000000000..93c1c2624
--- /dev/null
+++ b/data/emoticons/tango/embarrassed.png
diff --git a/data/emoticons/tango/emoticons.py b/data/emoticons/tango/emoticons.py
new file mode 100644
index 000000000..43c7ce37f
--- /dev/null
+++ b/data/emoticons/tango/emoticons.py
@@ -0,0 +1,52 @@
+# coding=utf-8
+emoticons = {
+        'angel.png': ['O:-)', 'o:-)', '0:-)'],
+        'curl-lip.png': [':-)', ':)', '=)'],
+        'sarcastic.png': [';D', ';-D'],
+        'sad.png': [':-(', ':(', '=('],
+        'wink.png': [';-)', ';)'],
+        'tongue.png': [':-P', ':P', ':-p', ':p'],
+        'glasses-cool': ['8-)', 'B-)', '(H)'],
+        'laugh.png': [':-D', ':D'],
+        'embarrassed.png': [':-[', ':['],
+        'shout.png': ['=-O', ':-O', ':O'],
+        'kiss.png': [':-{}', ':-*', ':*', '(K)'],
+        'crying.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
+        'shut-mouth': [':-X'],
+        'hypnotized.png': ['%)', '%-)'],
+        'freaked-out.png': [':o'],
+        'thinking.png': [':-|', ':|'],
+        'arrogant.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
+        'devil.png': [':->', ']:->', '>:-)', '>:)', '(6)'],
+        'musical-note.png': ['[:-}'],
+        'sick.png': [':-!'],
+        'giggle.png': ['*JOKINGLY*'],
+        'cute.png': ['*KISSED*'],
+        'sleepy.png': ['*TIRED*'],
+        'terror.png': ['*STOP*'],
+        'handshake.png': ['*KISSING*'],
+        'rose.png': ['@}->--', '(F)'],
+        'good.png': ['(Y)', '*THUMBS UP*'],
+        'beer.png': ['(B)', '*DRINK*'],
+        'love.png': ['<3', '(L)', '*IN LOVE*'],
+        'bomb.png': ['@='],
+        'question.png': ['*HELP*'],
+        'cowboy.png': ['\m/'],
+        'fingers-crossed.png': ['*OK*'],
+        'alien.png': ['*WASSUP*'],
+        'disapointed.png': ['*SORRY*'],
+        'clap.png': ['*BRAVO*'],
+        'rotfl.png': ['*ROFL*'],
+        'dont-know.png': ['*PARDON*'],
+        'confused.png': ['*NO*'],
+        'silly.png': ['*CRAZY*'],
+        'doh.png': ['*DONT_KNOW*'],
+        'party.png': ['*DANCE*'],
+        'dance.png': ['*YAHOO*'],
+        'victory.png': ['*HI*'],
+        'go-away.png': ['*BYE*'],
+        'smirk.png': ['*YES*'],
+        'pissed-off.png': ['*WALL*'],
+        'mail.png': ['*WRITE*', '(E)'],
+        'tremble.png': ['*SCRATCH*'],
+}
+\ No newline at end of file
diff --git a/data/emoticons/tango/fingers-crossed.png b/data/emoticons/tango/fingers-crossed.png
new file mode 100644
index 000000000..6494707c5
--- /dev/null
+++ b/data/emoticons/tango/fingers-crossed.png
diff --git a/data/emoticons/tango/freaked-out.png b/data/emoticons/tango/freaked-out.png
new file mode 100644
index 000000000..3bb6d58e5
--- /dev/null
+++ b/data/emoticons/tango/freaked-out.png
diff --git a/data/emoticons/tango/giggle.png b/data/emoticons/tango/giggle.png
new file mode 100644
index 000000000..e583178f6
--- /dev/null
+++ b/data/emoticons/tango/giggle.png
diff --git a/data/emoticons/tango/glasses-cool.png b/data/emoticons/tango/glasses-cool.png
new file mode 100644
index 000000000..6fdb5fe85
--- /dev/null
+++ b/data/emoticons/tango/glasses-cool.png
diff --git a/data/emoticons/tango/go-away.png b/data/emoticons/tango/go-away.png
new file mode 100644
index 000000000..efc98af5a
--- /dev/null
+++ b/data/emoticons/tango/go-away.png
diff --git a/data/emoticons/tango/good.png b/data/emoticons/tango/good.png
new file mode 100644
index 000000000..127d07313
--- /dev/null
+++ b/data/emoticons/tango/good.png
diff --git a/data/emoticons/tango/handshake.png b/data/emoticons/tango/handshake.png
new file mode 100644
index 000000000..5c6d6a531
--- /dev/null
+++ b/data/emoticons/tango/handshake.png
diff --git a/data/emoticons/tango/hypnotized.png b/data/emoticons/tango/hypnotized.png
new file mode 100644
index 000000000..62823ce72
--- /dev/null
+++ b/data/emoticons/tango/hypnotized.png
diff --git a/data/emoticons/tango/kiss.png b/data/emoticons/tango/kiss.png
new file mode 100644
index 000000000..8d0d2e8b1
--- /dev/null
+++ b/data/emoticons/tango/kiss.png
diff --git a/data/emoticons/tango/laugh.png b/data/emoticons/tango/laugh.png
new file mode 100644
index 000000000..fdb4f50c0
--- /dev/null
+++ b/data/emoticons/tango/laugh.png
diff --git a/data/emoticons/tango/love.png b/data/emoticons/tango/love.png
new file mode 100644
index 000000000..5171deed6
--- /dev/null
+++ b/data/emoticons/tango/love.png
diff --git a/data/emoticons/tango/mail.png b/data/emoticons/tango/mail.png
new file mode 100644
index 000000000..027bdb090
--- /dev/null
+++ b/data/emoticons/tango/mail.png
diff --git a/data/emoticons/tango/musical-note.png b/data/emoticons/tango/musical-note.png
new file mode 100644
index 000000000..5990ae544
--- /dev/null
+++ b/data/emoticons/tango/musical-note.png
diff --git a/data/emoticons/tango/party.png b/data/emoticons/tango/party.png
new file mode 100644
index 000000000..bcc7a4ffe
--- /dev/null
+++ b/data/emoticons/tango/party.png
diff --git a/data/emoticons/tango/pissed-off.png b/data/emoticons/tango/pissed-off.png
new file mode 100644
index 000000000..a1c8c8c64
--- /dev/null
+++ b/data/emoticons/tango/pissed-off.png
diff --git a/data/emoticons/tango/question.png b/data/emoticons/tango/question.png
new file mode 100644
index 000000000..fc657b46a
--- /dev/null
+++ b/data/emoticons/tango/question.png
diff --git a/data/emoticons/tango/rose.png b/data/emoticons/tango/rose.png
new file mode 100644
index 000000000..ff7180ed3
--- /dev/null
+++ b/data/emoticons/tango/rose.png
diff --git a/data/emoticons/tango/rotfl.png b/data/emoticons/tango/rotfl.png
new file mode 100644
index 000000000..9f985a2e6
--- /dev/null
+++ b/data/emoticons/tango/rotfl.png
diff --git a/data/emoticons/tango/sad.png b/data/emoticons/tango/sad.png
new file mode 100644
index 000000000..643fd4379
--- /dev/null
+++ b/data/emoticons/tango/sad.png
diff --git a/data/emoticons/tango/sarcastic.png b/data/emoticons/tango/sarcastic.png
new file mode 100644
index 000000000..ece6dd522
--- /dev/null
+++ b/data/emoticons/tango/sarcastic.png
diff --git a/data/emoticons/tango/shout.png b/data/emoticons/tango/shout.png
new file mode 100644
index 000000000..c7aa7a9d7
--- /dev/null
+++ b/data/emoticons/tango/shout.png
diff --git a/data/emoticons/tango/shut-mouth.png b/data/emoticons/tango/shut-mouth.png
new file mode 100644
index 000000000..c98a29780
--- /dev/null
+++ b/data/emoticons/tango/shut-mouth.png
diff --git a/data/emoticons/tango/sick.png b/data/emoticons/tango/sick.png
new file mode 100644
index 000000000..777e6fd84
--- /dev/null
+++ b/data/emoticons/tango/sick.png
diff --git a/data/emoticons/tango/silly.png b/data/emoticons/tango/silly.png
new file mode 100644
index 000000000..b944b7e9f
--- /dev/null
+++ b/data/emoticons/tango/silly.png
diff --git a/data/emoticons/tango/sleepy.png b/data/emoticons/tango/sleepy.png
new file mode 100644
index 000000000..25449039c
--- /dev/null
+++ b/data/emoticons/tango/sleepy.png
diff --git a/data/emoticons/tango/smirk.png b/data/emoticons/tango/smirk.png
new file mode 100644
index 000000000..77e97ee5c
--- /dev/null
+++ b/data/emoticons/tango/smirk.png
diff --git a/data/emoticons/tango/terror.png b/data/emoticons/tango/terror.png
new file mode 100644
index 000000000..104d01252
--- /dev/null
+++ b/data/emoticons/tango/terror.png
diff --git a/data/emoticons/tango/thinking.png b/data/emoticons/tango/thinking.png
new file mode 100644
index 000000000..9d1d752b1
--- /dev/null
+++ b/data/emoticons/tango/thinking.png
diff --git a/data/emoticons/tango/tongue.png b/data/emoticons/tango/tongue.png
new file mode 100644
index 000000000..144318dd1
--- /dev/null
+++ b/data/emoticons/tango/tongue.png
diff --git a/data/emoticons/tango/tremble.png b/data/emoticons/tango/tremble.png
new file mode 100644
index 000000000..3a39e8796
--- /dev/null
+++ b/data/emoticons/tango/tremble.png
diff --git a/data/emoticons/tango/victory.png b/data/emoticons/tango/victory.png
new file mode 100644
index 000000000..d0b635e9b
--- /dev/null
+++ b/data/emoticons/tango/victory.png
diff --git a/data/emoticons/tango/wink.png b/data/emoticons/tango/wink.png
new file mode 100644
index 000000000..662baa8ce
--- /dev/null
+++ b/data/emoticons/tango/wink.png
diff --git a/data/glade/message_window.glade b/data/glade/message_window.glade
index 1532b5b3a..e58931f0d 100644
--- a/data/glade/message_window.glade
+++ b/data/glade/message_window.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <glade-interface>
-  <!-- interface-requires gtk+ 2.14 -->
+  <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="message_window">
     <property name="default_width">480</property>
@@ -18,533 +18,834 @@
               <widget class="GtkVBox" id="chat_child_vbox">
                 <property name="can_focus">True</property>
                 <property name="border_width">3</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">1</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment">
+                  <widget class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
-                    <property name="left_padding">3</property>
-                    <property name="right_padding">3</property>
                     <child>
-                      <widget class="GtkEventBox" id="banner_eventbox">
+                      <widget class="GtkVBox" id="vbox2">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox3004">
+                          <widget class="GtkAlignment" id="alignment">
                             <property name="visible">True</property>
+                            <property name="left_padding">3</property>
+                            <property name="right_padding">3</property>
                             <child>
-                              <widget class="GtkImage" id="banner_status_image">
+                              <widget class="GtkEventBox" id="banner_eventbox">
                                 <property name="visible">True</property>
-                                <property name="ypad">5</property>
-                                <property name="stock">gtk-missing-image</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox3004">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkImage" id="banner_status_image">
+                                        <property name="visible">True</property>
+                                        <property name="ypad">5</property>
+                                        <property name="stock">gtk-missing-image</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkVBox" id="banner_vbox">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="border_width">5</property>
+                                        <property name="orientation">vertical</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="banner_name_label">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">&lt;span weight="heavy" size="large"&gt;Contact name&lt;/span&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="banner_label">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">label</property>
+                                            <property name="use_markup">True</property>
+                                            <property name="selectable">True</property>
+                                            <signal name="populate_popup" handler="on_banner_label_populate_popup"/>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox2">
+                                        <property name="visible">True</property>
+                                        <property name="spacing">4</property>
+                                        <child>
+                                          <widget class="GtkImage" id="mood_image">
+                                            <property name="no_show_all">True</property>
+                                            <property name="stock">None</property>
+                                            <property name="icon-size">1</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkImage" id="activity_image">
+                                            <property name="no_show_all">True</property>
+                                            <property name="stock">None</property>
+                                            <property name="icon-size">1</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkImage" id="tune_image">
+                                            <property name="no_show_all">True</property>
+                                            <property name="stock">None</property>
+                                            <property name="icon-size">1</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkEventBox" id="location_eventbox">
+                                            <property name="visible">True</property>
+                                            <property name="visible_window">False</property>
+                                            <child>
+                                              <widget class="GtkImage" id="location_image">
+                                                <property name="no_show_all">True</property>
+                                                <property name="stock">None</property>
+                                                <property name="icon-size">1</property>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkImage" id="audio_banner_image">
+                                            <property name="visible">True</property>
+                                            <property name="stock">None</property>
+                                            <property name="icon-size">1</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkImage" id="video_banner_image">
+                                            <property name="visible">True</property>
+                                            <property name="stock">None</property>
+                                            <property name="icon-size">1</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">5</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment3">
+                                            <property name="width_request">11</property>
+                                            <property name="visible">True</property>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">6</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEventBox" id="avatar_eventbox">
+                                        <property name="visible">True</property>
+                                        <property name="visible_window">False</property>
+                                        <child>
+                                          <widget class="GtkImage" id="avatar_image">
+                                            <property name="visible">True</property>
+                                            <property name="stock">None</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkVBox" id="vbox106">
+                            <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <widget class="GtkScrolledWindow" id="conversation_scrolledwindow">
+                                <property name="height_request">60</property>
+                                <property name="can_focus">True</property>
+                                <property name="border_width">3</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
+                                <property name="shadow_type">in</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </widget>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="padding">5</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="banner_vbox">
+                              <widget class="GtkHBox" id="hbox">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="border_width">5</property>
                                 <child>
-                                  <widget class="GtkLabel" id="banner_name_label">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label">&lt;span weight="heavy" size="large"&gt;Contact name&lt;/span&gt;</property>
-                                    <property name="use_markup">True</property>
+                                  <widget class="GtkButton" id="authentication_button">
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">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="no_show_all">True</property>
+                                    <property name="relief">none</property>
+                                    <property name="focus_on_click">False</property>
+                                    <child>
+                                      <widget class="GtkImage" id="lock_image">
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="stock">gtk-dialog-authentication</property>
+                                        <property name="icon-size">1</property>
+                                      </widget>
+                                    </child>
                                   </widget>
                                   <packing>
+                                    <property name="expand">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <placeholder/>
+                                  <widget class="GtkScrolledWindow" id="message_scrolledwindow">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="border_width">3</property>
+                                    <property name="hscrollbar_policy">never</property>
+                                    <property name="vscrollbar_policy">never</property>
+                                    <property name="shadow_type">in</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </widget>
                               <packing>
+                                <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="actions_hbox">
+                            <property name="visible">True</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox2">
+                              <widget class="GtkButton" id="emoticons_button">
                                 <property name="visible">True</property>
-                                <property name="spacing">4</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">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="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Show a list of emoticons (Alt+M)</property>
+                                <property name="relief">none</property>
+                                <property name="focus_on_click">False</property>
                                 <child>
-                                  <widget class="GtkImage" id="mood_image">
-                                    <property name="no_show_all">True</property>
-                                    <property name="stock">None</property>
+                                  <widget class="GtkImage" id="emoticons_button_image">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="stock">gtk-missing-image</property>
                                     <property name="icon-size">1</property>
                                   </widget>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="formattings_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">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="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Show a list of formattings</property>
+                                <property name="relief">none</property>
+                                <property name="focus_on_click">False</property>
                                 <child>
-                                  <widget class="GtkImage" id="activity_image">
-                                    <property name="no_show_all">True</property>
-                                    <property name="stock">None</property>
+                                  <widget class="GtkImage" id="image10">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-bold</property>
                                     <property name="icon-size">1</property>
                                   </widget>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
                                 </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkVSeparator" id="vseparator1">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="orientation">vertical</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="add_to_roster_button">
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">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="no_show_all">True</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Add this contact to roster (Ctrl+D)</property>
+                                <property name="relief">none</property>
                                 <child>
-                                  <widget class="GtkImage" id="tune_image">
-                                    <property name="no_show_all">True</property>
-                                    <property name="pixbuf">../emoticons/static/music.png</property>
+                                  <widget class="GtkImage" id="image9">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="stock">gtk-add</property>
                                     <property name="icon-size">1</property>
                                   </widget>
-                                  <packing>
-                                    <property name="position">2</property>
-                                  </packing>
                                 </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="send_file_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">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="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Send a file (Ctrl+F)</property>
+                                <property name="relief">none</property>
+                                <property name="focus_on_click">False</property>
                                 <child>
-                                  <widget class="GtkImage" id="audio_banner_image">
+                                  <widget class="GtkImage" id="image3">
                                     <property name="visible">True</property>
-                                    <property name="stock">None</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="icon-size">1</property>
                                   </widget>
-                                  <packing>
-                                    <property name="position">3</property>
-                                  </packing>
                                 </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkToggleButton" id="audio_togglebutton">
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Toggle audio session</property>
+                                <property name="relief">none</property>
                                 <child>
-                                  <widget class="GtkImage" id="video_banner_image">
+                                  <widget class="GtkImage" id="audio_image">
                                     <property name="visible">True</property>
-                                    <property name="stock">None</property>
+                                    <property name="stock">gtk-missing-image</property>
                                     <property name="icon-size">1</property>
                                   </widget>
-                                  <packing>
-                                    <property name="position">4</property>
-                                  </packing>
                                 </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkToggleButton" id="video_togglebutton">
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Toggle video session</property>
+                                <property name="relief">none</property>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment3">
-                                    <property name="width_request">11</property>
+                                  <widget class="GtkImage" id="video_image">
                                     <property name="visible">True</property>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
+                                    <property name="stock">gtk-missing-image</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
-                                  <packing>
-                                    <property name="position">5</property>
-                                  </packing>
                                 </child>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
+                                <property name="position">6</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEventBox" id="avatar_eventbox">
+                              <widget class="GtkButton" id="convert_to_gc_button">
                                 <property name="visible">True</property>
-                                <property name="visible_window">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">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="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property>
+                                <property name="relief">none</property>
+                                <property name="focus_on_click">False</property>
                                 <child>
-                                  <widget class="GtkImage" id="avatar_image">
+                                  <widget class="GtkImage" id="convert_to_gc_button_image">
                                     <property name="visible">True</property>
-                                    <property name="stock">None</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="stock">gtk-missing-image</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
                                 </child>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
+                                <property name="position">7</property>
                               </packing>
                             </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkVBox" id="vbox106">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkScrolledWindow" id="conversation_scrolledwindow">
-                        <property name="height_request">60</property>
-                        <property name="can_focus">True</property>
-                        <property name="border_width">3</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkHBox" id="hbox">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <widget class="GtkButton" id="authentication_button">
-                            <property name="can_focus">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="no_show_all">True</property>
-                            <property name="relief">none</property>
-                            <property name="focus_on_click">False</property>
                             <child>
-                              <widget class="GtkImage" id="lock_image">
+                              <widget class="GtkButton" id="contact_information_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="stock">gtk-dialog-authentication</property>
-                                <property name="icon-size">1</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Show the contact's profile (Ctrl+I)</property>
+                                <property name="relief">none</property>
+                                <property name="focus_on_click">False</property>
+                                <child>
+                                  <widget class="GtkImage" id="image2">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="stock">gtk-info</property>
+                                    <property name="icon-size">2</property>
+                                  </widget>
+                                </child>
                               </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">8</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="history_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">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="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Browse the chat history (Ctrl+H)</property>
+                                <property name="relief">none</property>
+                                <property name="focus_on_click">False</property>
+                                <child>
+                                  <widget class="GtkImage" id="image5">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="stock">gtk-justify-fill</property>
+                                    <property name="icon-size">1</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">9</property>
+                              </packing>
                             </child>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkScrolledWindow" id="message_scrolledwindow">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="border_width">3</property>
-                            <property name="hscrollbar_policy">never</property>
-                            <property name="vscrollbar_policy">never</property>
-                            <property name="shadow_type">in</property>
                             <child>
-                              <placeholder/>
+                              <widget class="GtkVSeparator" id="vseparator3">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="orientation">vertical</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">10</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="message_window_actions_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">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="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">Show a menu of advanced functions (Alt+D)</property>
+                                <property name="relief">none</property>
+                                <property name="focus_on_click">False</property>
+                                <child>
+                                  <widget class="GtkImage" id="image1">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="stock">gtk-execute</property>
+                                    <property name="icon-size">1</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">11</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment1">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">12</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="send_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment102">
+                                    <property name="visible">True</property>
+                                    <property name="xscale">0</property>
+                                    <property name="yscale">0</property>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox3010">
+                                        <property name="visible">True</property>
+                                        <property name="spacing">2</property>
+                                        <child>
+                                          <widget class="GtkImage" id="image1339">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-jump-to</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="label373">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes" comments="Make sure the character after &quot;_&quot; is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Send</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>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">13</property>
+                              </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="position">1</property>
+                            <property name="expand">False</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkHBox" id="actions_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkButton" id="emoticons_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Show a list of emoticons (Alt+M)</property>
-                        <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
-                        <child>
-                          <widget class="GtkImage" id="emoticons_button_image">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="stock">gtk-missing-image</property>
-                            <property name="icon-size">1</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="formattings_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Show a list of formattings</property>
-                        <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
-                        <child>
-                          <widget class="GtkImage" id="image10">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-bold</property>
-                            <property name="icon-size">1</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkVSeparator" id="vseparator1">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="add_to_roster_button">
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                      <widget class="GtkVBox" id="audio_vbox">
                         <property name="no_show_all">True</property>
-                        <property name="tooltip" translatable="yes">Add this contact to roster (Ctrl+D)</property>
-                        <property name="relief">none</property>
-                        <child>
-                          <widget class="GtkImage" id="image9">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="stock">gtk-add</property>
-                            <property name="icon-size">1</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="send_file_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Send a file (Ctrl+F)</property>
-                        <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
-                        <child>
-                          <widget class="GtkImage" id="image3">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="icon-size">1</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkToggleButton" id="audio_togglebutton">
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip" translatable="yes">Toggle audio session</property>
-                        <property name="relief">none</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkImage" id="audio_image">
+                          <widget class="GtkLabel" id="label3">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-missing-image</property>
-                            <property name="icon-size">1</property>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkToggleButton" id="video_togglebutton">
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip" translatable="yes">Toggle video session</property>
-                        <property name="relief">none</property>
                         <child>
-                          <widget class="GtkImage" id="video_image">
+                          <widget class="GtkTable" id="table1">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-missing-image</property>
-                            <property name="icon-size">1</property>
+                            <property name="n_rows">4</property>
+                            <property name="n_columns">3</property>
+                            <property name="column_spacing">6</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <widget class="GtkButton" id="1_button">
+                                <property name="label" translatable="yes">1</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="2_button">
+                                <property name="label" translatable="yes">2</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="3_button">
+                                <property name="label" translatable="yes">3</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="4_button">
+                                <property name="label" translatable="yes">4</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="5_button">
+                                <property name="label" translatable="yes">5</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </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="GtkButton" id="6_button">
+                                <property name="label" translatable="yes">6</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </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>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="7_button">
+                                <property name="label" translatable="yes">7</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="8_button">
+                                <property name="label" translatable="yes">8</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </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="9_button">
+                                <property name="label" translatable="yes">9</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="*_button">
+                                <property name="label" translatable="yes">*</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="0_button">
+                                <property name="label" translatable="yes">0</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </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>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="#_button">
+                                <property name="label" translatable="yes">#</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </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>
+                              </packing>
+                            </child>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="convert_to_gc_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property>
-                        <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <child>
-                          <widget class="GtkImage" id="convert_to_gc_button_image">
+                          <widget class="GtkLabel" id="label1">
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="stock">gtk-missing-image</property>
-                            <property name="icon-size">1</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Sound volume:</property>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="contact_information_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Show the contact's profile (Ctrl+I)</property>
-                        <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <child>
-                          <widget class="GtkImage" id="image2">
+                          <widget class="GtkHScale" id="sound_hscale">
+                            <property name="width_request">110</property>
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="stock">gtk-info</property>
-                            <property name="icon-size">2</property>
+                            <property name="can_focus">True</property>
+                            <property name="adjustment">0 0 110 1 10 10</property>
+                            <property name="digits">0</property>
+                            <property name="value_pos">bottom</property>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">3</property>
+                          </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="history_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Browse the chat history (Ctrl+H)</property>
-                        <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <child>
-                          <widget class="GtkImage" id="image5">
+                          <widget class="GtkLabel" id="label2">
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="stock">gtk-justify-fill</property>
-                            <property name="icon-size">1</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Mic volume:</property>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">4</property>
+                          </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkVSeparator" id="vseparator3">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="message_window_actions_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Show a menu of advanced functions (Alt+D)</property>
-                        <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <child>
-                          <widget class="GtkImage" id="image1">
+                          <widget class="GtkHScale" id="mic_hscale">
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="stock">gtk-execute</property>
-                            <property name="icon-size">1</property>
+                            <property name="can_focus">True</property>
+                            <property name="adjustment">0 0 110 1 10 10</property>
+                            <property name="digits">0</property>
+                            <property name="value_pos">bottom</property>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">5</property>
+                          </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment1">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="send_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <child>
-                          <widget class="GtkAlignment" id="alignment102">
+                          <widget class="GtkLabel" id="label4">
                             <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <widget class="GtkHBox" id="hbox3010">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <widget class="GtkImage" id="image1339">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-jump-to</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label373">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes" comments="Make sure the character after &quot;_&quot; is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Send</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>
+                          <packing>
+                            <property name="position">6</property>
+                          </packing>
                         </child>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="position">13</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </widget>
@@ -614,6 +915,7 @@
               <widget class="GtkVBox" id="muc_child_vbox">
                 <property name="can_focus">True</property>
                 <property name="border_width">3</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <widget class="GtkAlignment" id="alignment103">
                     <property name="visible">True</property>
@@ -643,6 +945,7 @@
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="border_width">5</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <widget class="GtkLabel" id="banner_name_label">
                                     <property name="visible">True</property>
@@ -655,7 +958,16 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <placeholder/>
+                                  <widget class="GtkLabel" id="banner_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">label</property>
+                                    <property name="use_markup">True</property>
+                                    <property name="selectable">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </widget>
                               <packing>
@@ -683,10 +995,12 @@
                       <widget class="GtkVBox" id="vbox108">
                         <property name="width_request">0</property>
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <widget class="GtkVBox" id="vbox109">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkScrolledWindow" id="conversation_scrolledwindow">
diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade
index 627c5cfe9..fe877da9d 100644
--- a/data/glade/preferences_window.glade
+++ b/data/glade/preferences_window.glade
@@ -11,6 +11,7 @@
     <child>
       <widget class="GtkVBox" id="vbox13">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <widget class="GtkNotebook" id="preferences_notebook">
@@ -21,6 +22,7 @@
               <widget class="GtkVBox" id="vbox41">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <widget class="GtkFrame" id="frame1">
@@ -38,6 +40,7 @@
                           <widget class="GtkVBox" id="vbox1">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkCheckButton" id="show_avatars_in_roster_checkbutton">
@@ -125,6 +128,24 @@
                               </packing>
                             </child>
                             <child>
+                              <widget class="GtkCheckButton" id="show_location_in_roster_checkbutton">
+                                <property name="label" translatable="yes">Display _location of contacts in roster</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">If checked, Gajim will display the location of contacts in the roster window</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child>
                               <widget class="GtkHBox" id="hbox3">
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
@@ -169,7 +190,7 @@
                                 </child>
                               </widget>
                               <packing>
-                                <property name="position">5</property>
+                                <property name="position">6</property>
                               </packing>
                             </child>
                           </widget>
@@ -363,6 +384,7 @@ Detached roster with chat grouped by type</property>
               <widget class="GtkVBox" id="vbox42">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <widget class="GtkFrame" id="frame29">
@@ -377,6 +399,7 @@ Detached roster with chat grouped by type</property>
                         <child>
                           <widget class="GtkVBox" id="vbox67">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkHBox" id="hbox1">
@@ -475,6 +498,7 @@ Show only in roster</property>
                                     <child>
                                       <widget class="GtkVBox" id="vbox_gmail">
                                         <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <widget class="GtkCheckButton" id="notify_gmail_checkbutton">
@@ -626,6 +650,7 @@ Always</property>
                         <child>
                           <widget class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkHBox" id="hbox4">
@@ -721,6 +746,7 @@ Always</property>
               <widget class="GtkVBox" id="vbox11">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <widget class="GtkFrame" id="frame13">
@@ -848,6 +874,7 @@ Disabled</property>
               <widget class="GtkVBox" id="status_vbox">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <widget class="GtkFrame" id="frame81">
@@ -1044,6 +1071,7 @@ $T will be replaced by auto-not-available timeout</property>
                           <widget class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkHBox" id="hbox2934">
@@ -1293,6 +1321,7 @@ $T will be replaced by auto-not-available timeout</property>
               <widget class="GtkVBox" id="vbox58">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <widget class="GtkFrame" id="frame9">
@@ -1685,7 +1714,7 @@ $T will be replaced by auto-not-available timeout</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox7">
+                              <widget class="GtkHBox" id="hbox8">
                                 <property name="visible">True</property>
                                 <child>
                                   <widget class="GtkCheckButton" id="incoming_msg_checkbutton">
@@ -1725,7 +1754,7 @@ $T will be replaced by auto-not-available timeout</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox8">
+                              <widget class="GtkHBox" id="hbox9">
                                 <property name="visible">True</property>
                                 <child>
                                   <widget class="GtkCheckButton" id="outgoing_msg_checkbutton">
@@ -1765,7 +1794,7 @@ $T will be replaced by auto-not-available timeout</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox9">
+                              <widget class="GtkHBox" id="hbox10">
                                 <property name="visible">True</property>
                                 <child>
                                   <placeholder/>
@@ -1794,7 +1823,7 @@ $T will be replaced by auto-not-available timeout</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox10">
+                              <widget class="GtkHBox" id="hbox11">
                                 <property name="visible">True</property>
                                 <child>
                                   <placeholder/>
@@ -1825,7 +1854,7 @@ $T will be replaced by auto-not-available timeout</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox11">
+                              <widget class="GtkHBox" id="hbox12">
                                 <property name="visible">True</property>
                                 <child>
                                   <placeholder/>
@@ -1854,7 +1883,7 @@ $T will be replaced by auto-not-available timeout</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox12">
+                              <widget class="GtkHBox" id="hbox13">
                                 <property name="visible">True</property>
                                 <child>
                                   <placeholder/>
@@ -1922,9 +1951,277 @@ $T will be replaced by auto-not-available timeout</property>
               </packing>
             </child>
             <child>
+              <widget class="GtkVBox" id="vbox4">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
+                <child>
+                  <widget class="GtkFrame" id="audio_frame">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment6">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkTable" id="table6">
+                            <property name="visible">True</property>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">6</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <widget class="GtkComboBox" id="audio_input_combobox">
+                                <property name="visible">True</property>
+                                <signal name="changed" handler="on_audio_input_combobox_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="audio_output_combobox">
+                                <property name="visible">True</property>
+                                <signal name="changed" handler="on_audio_output_combobox_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>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label18">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Audio input device</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label19">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Audio output device</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label16">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Audio&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame6">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment7">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkTable" id="table8">
+                            <property name="visible">True</property>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">6</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <widget class="GtkLabel" id="label20">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Video input device</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label21">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Video output device</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="video_input_combobox">
+                                <property name="visible">True</property>
+                                <signal name="changed" handler="on_video_input_combobox_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="video_output_combobox">
+                                <property name="visible">True</property>
+                                <signal name="changed" handler="on_video_output_combobox_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>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label17">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Video&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame7">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment9">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkTable" id="table9">
+                            <property name="visible">True</property>
+                            <property name="n_columns">4</property>
+                            <property name="column_spacing">6</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <widget class="GtkLabel" id="label24">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">STUN server:</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label25">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;i&gt;(example: stunserver.org)&lt;/i&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">3</property>
+                                <property name="right_attach">4</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="stun_server_entry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip" translatable="yes">STUN server hostname. If none given, Gajim will try
+to discover one from server.</property>
+                                <property name="invisible_char">&#x25CF;</property>
+                                <signal name="changed" handler="stun_server_entry_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="stun_checkbutton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_stun_checkbutton_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label22">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Connection&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label15">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Audio / Video</property>
+              </widget>
+              <packing>
+                <property name="position">5</property>
+                <property name="tab_fill">False</property>
+                <property name="type">tab</property>
+              </packing>
+            </child>
+            <child>
               <widget class="GtkVBox" id="vbox45">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <widget class="GtkFrame" id="applications_frame">
@@ -1939,6 +2236,7 @@ $T will be replaced by auto-not-available timeout</property>
                         <child>
                           <widget class="GtkVBox" id="vbox50">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkComboBox" id="applications_combobox">
@@ -2109,7 +2407,7 @@ Custom</property>
                           <widget class="GtkTable" id="table3">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="n_rows">3</property>
+                            <property name="n_rows">4</property>
                             <property name="column_spacing">6</property>
                             <property name="row_spacing">6</property>
                             <child>
@@ -2159,6 +2457,21 @@ Custom</property>
                                 <property name="bottom_attach">3</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="send_idle_time_checkbutton">
+                                <property name="label" translatable="yes">Allow my _idle time to be sent</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_allow_idle_time_checkbutton_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                              </packing>
+                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -2193,6 +2506,7 @@ Custom</property>
                         <child>
                           <widget class="GtkVBox" id="vbox66">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkCheckButton" id="log_show_changes_checkbutton">
@@ -2324,7 +2638,7 @@ Custom</property>
                 </child>
               </widget>
               <packing>
-                <property name="position">5</property>
+                <property name="position">6</property>
               </packing>
             </child>
             <child>
@@ -2333,7 +2647,7 @@ Custom</property>
                 <property name="label" translatable="yes">Advanced</property>
               </widget>
               <packing>
-                <property name="position">5</property>
+                <property name="position">6</property>
                 <property name="tab_fill">False</property>
                 <property name="type">tab</property>
               </packing>
diff --git a/data/glade/xml_console_window.glade b/data/glade/xml_console_window.glade
index 548275c61..4b3496d77 100644
--- a/data/glade/xml_console_window.glade
+++ b/data/glade/xml_console_window.glade
@@ -1,376 +1,371 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0"?>
 <glade-interface>
-
-<widget class="GtkWindow" id="xml_console_window">
-  <property name="border_width">12</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">550</property>
-  <property name="default_height">450</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_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <signal name="delete_event" handler="on_xml_console_window_delete_event" last_modification_time="Sat, 06 Aug 2005 00:03:05 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkLabel" id="label342">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;Jabber Traffic&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</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="GtkScrolledWindow" id="scrolledwindow43">
-	  <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="stanzas_log_textview">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</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_CHAR</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="GtkHBox" id="hbox2988">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="enable_checkbutton">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes" comments="XML Console enable checkbutton">Enable</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	      <signal name="toggled" handler="on_enable_checkbutton_toggled" last_modification_time="Sat, 13 Aug 2005 14:36:52 GMT"/>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label351">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></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.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">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="clear_button">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-clear</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_clear_button_clicked" last_modification_time="Sat, 06 Aug 2005 00:20:16 GMT"/>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkExpander" id="expander">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="expanded">False</property>
-	  <property name="spacing">6</property>
-	  <signal name="activate" handler="on_expander_activate" last_modification_time="Mon, 04 Jul 2005 22:24:33 GMT"/>
-
-	  <child>
-	    <widget class="GtkVBox" id="input_vbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow42">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTextView" id="input_textview">
-		      <property name="visible">True</property>
-		      <property name="can_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_CHAR</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="hbuttonbox31">
-		  <property name="visible">True</property>
-		  <property name="layout_style">GTK_BUTTONBOX_END</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkButton" id="iq_button">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes" comments="Info/Query make the &quot;IQ&quot; initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)">Info/Query</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes" comments="Info/Query: all(?) jabber xml start with &lt;iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say &lt;iq in your language (of course))">_IQ</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="on_iq_button_clicked" last_modification_time="Mon, 04 Jul 2005 19:35:55 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="presence_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Presence</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="on_presence_button_clicked" last_modification_time="Mon, 04 Jul 2005 19:36:08 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="message_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Message</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="on_message_button_clicked" last_modification_time="Mon, 04 Jul 2005 19:36:21 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="send_button">
-		      <property name="visible">True</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_send_button_clicked" last_modification_time="Mon, 04 Jul 2005 19:36:26 GMT"/>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment80">
-			  <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="hbox2980">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image833">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-apply</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="label341">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Send</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>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label343">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;XML Input&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</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">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <widget class="GtkWindow" id="xml_console_window">
+    <property name="border_width">12</property>
+    <property name="default_width">550</property>
+    <property name="default_height">450</property>
+    <signal name="delete_event" handler="on_xml_console_window_delete_event"/>
+    <child>
+      <widget class="GtkVBox" id="vbox">
+        <property name="visible">True</property>
+        <property name="spacing">6</property>
+        <child>
+          <widget class="GtkLabel" id="label342">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">&lt;b&gt;Jabber Traffic&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkScrolledWindow" id="scrolledwindow43">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <widget class="GtkTextView" id="stanzas_log_textview">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="wrap_mode">char</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHBox" id="hbox2988">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkCheckButton" id="enable_checkbutton">
+                <property name="label" translatable="yes" comments="XML Console enable checkbutton">Enable</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_enable_checkbutton_toggled"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label351">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="clear_button">
+                <property name="label">gtk-clear</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_clear_button_clicked"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkExpander" id="expander1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="spacing">6</property>
+            <child>
+              <widget class="GtkVBox" id="input_vbox1">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="in_stanza_checkbutton">
+                        <property name="label" translatable="yes">Hide IN stanzas</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_in_stanza_checkbutton_toggled"/>
+                      </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="out_stanza_checkbutton">
+                        <property name="label" translatable="yes">Hide OUT stanzas</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_out_stanza_checkbutton_toggled"/>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="presence_stanza_checkbutton">
+                        <property name="label" translatable="yes">Hide Presence stanzas</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_presence_stanza_checkbutton_toggled"/>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="iq_stanza_checkbutton">
+                        <property name="label" translatable="yes">Hide IQ stanzas</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_iq_stanza_checkbutton_toggled"/>
+                      </widget>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="message_stanza_checkbutton">
+                        <property name="label" translatable="yes">Hide Message stanzas</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_message_stanza_checkbutton_toggled"/>
+                      </widget>
+                      <packing>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Filter&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkExpander" id="expander">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="spacing">6</property>
+            <signal name="activate" handler="on_expander_activate"/>
+            <child>
+              <widget class="GtkVBox" id="input_vbox">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow42">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="vscrollbar_policy">never</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <widget class="GtkTextView" id="input_textview">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="wrap_mode">char</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHButtonBox" id="hbuttonbox31">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <property name="layout_style">end</property>
+                    <child>
+                      <widget class="GtkButton" id="iq_button">
+                        <property name="label" translatable="yes" comments="Info/Query: all(?) jabber xml start with &lt;iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say &lt;iq in your language (of course))">_IQ</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="tooltip" translatable="yes" comments="Info/Query make the &quot;IQ&quot; initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)">Info/Query</property>
+                        <property name="use_underline">True</property>
+                        <signal name="clicked" handler="on_iq_button_clicked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="presence_button">
+                        <property name="label" translatable="yes">_Presence</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <signal name="clicked" handler="on_presence_button_clicked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="message_button">
+                        <property name="label" translatable="yes">_Message</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <signal name="clicked" handler="on_message_button_clicked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="send_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
+                        <signal name="clicked" handler="on_send_button_clicked"/>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment80">
+                            <property name="visible">True</property>
+                            <property name="xscale">0</property>
+                            <property name="yscale">0</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox2980">
+                                <property name="visible">True</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <widget class="GtkImage" id="image833">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-apply</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label341">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">_Send</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>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label343">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;XML Input&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>
diff --git a/data/iconsets/Makefile.am b/data/iconsets/Makefile.am
index c609e3df6..d83643525 100644
--- a/data/iconsets/Makefile.am
+++ b/data/iconsets/Makefile.am
@@ -1,39 +1,10 @@
 iconsetdir = $(pkgdatadir)/data/iconsets
-
-iconset_DATA = 
-
-ICONSET_DIRS = **/{16x16,32x32,48x48} \
-			   transports/**/{16x16,32x32,48x48}
-
-ICONSET_FILES = **/{16x16,32x32,48x48}/{*.gif,*.png} \
-			   transports/**/{16x16,32x32,48x48}/{*.gif,*.png}
-
-install-data-local:
-	@for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \
-		if test -d $(srcdir)/$$d;then \
-			echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d"; \
-			$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d || exit 1; \
-		fi; \
-	done
-	for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \
-		if test -f $(srcdir)/$$f; then \
-			echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \
-			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \
-		fi; \
-	done; 
-
-dist-hook:
-	@for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \
-		if test -d $(srcdir)/$$d;then \
-			echo " $(mkdir_p) $(distdir)/$$d"; \
-			$(mkdir_p) $(distdir)/$$d || exit 1; \
-		fi; \
-	done
-	for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \
-		if test -f $(srcdir)/$$f; then \
-			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
-			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
-		fi; \
-	done;
+nobase_dist_iconset_DATA = \
+	$(srcdir)/*/16x16/* \
+	$(srcdir)/*/32x32/* \
+	$(srcdir)/*/48x48/* \
+	$(srcdir)/transports/*/16x16/* \
+	$(srcdir)/transports/*/32x32/* \
+	$(srcdir)/transports/*/48x48/*
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/iconsets/jabberbulb/32x32/icos/online.ico b/data/iconsets/jabberbulb/32x32/icos/online.ico
deleted file mode 100644
index 0b87bd30b..000000000
--- a/data/iconsets/jabberbulb/32x32/icos/online.ico
+++ /dev/null
diff --git a/data/moods/Makefile.am b/data/moods/Makefile.am
index 0caed1d81..174466374 100644
--- a/data/moods/Makefile.am
+++ b/data/moods/Makefile.am
@@ -1,38 +1,4 @@
 moodsdir = $(pkgdatadir)/data/moods
-
-moods_DATA = 
-
-MOODS_DIRS = **
-
-MOODS_FILES = **/{*.png,*.gif}
-
-
-install-data-local:
-	@for d in $$(cd $(srcdir); echo $(MOODS_DIRS));do \
-		if test -d $(srcdir)/$$d;then \
-			echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/moods/$$d"; \
-			$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/moods/$$d || exit 1; \
-		fi; \
-	done; \
-	for f in $$(cd $(srcdir); echo $(MOODS_FILES));do \
-		if test -f $(srcdir)/$$f; then \
-			echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/moods/$$f"; \
-			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/moods/$$f || exit 1; \
-		fi; \
-	done; 
-
-dist-hook:
-	@for d in $$(cd $(srcdir); echo $(MOODS_DIRS));do \
-		if test -d $(srcdir)/$$d;then \
-			echo " $(mkdir_p) $(distdir)/$$d"; \
-			$(mkdir_p) $(distdir)/$$d || exit 1; \
-		fi; \
-	done; \
-	for f in $$(cd $(srcdir); echo $(MOODS_FILES));do \
-		if test -f $(srcdir)/$$f; then \
-			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
-			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
-		fi; \
-	done;
+nobase_dist_moods_DATA = $(srcdir)/*/*
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index d59751a10..a7eadc116 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -1,19 +1,5 @@
 pixmapsdir = $(pkgdatadir)/data/pixmaps
-pixmaps_DATA = $(srcdir)/*.png \
-				gajim.svg \
-			   gajim.ico
-
-pixmapseventsdir = $(pkgdatadir)/data/pixmaps/events
-pixmapsevents_DATA = $(srcdir)/events/*.png
-
-pixmapsagentsdir = $(pkgdatadir)/data/pixmaps/agents
-pixmapsagents_DATA = $(srcdir)/agents/*.png
-
-EXTRA_DIST = $(pixmaps_DATA) $(pixmapsevents_DATA) $(pixmapsagents_DATA)
-
-gajimpixmapdir = $(datadir)/pixmaps
-gajimpixmap_DATA = gajim.png \
-						gajim.svg \
-						gajim_about.png
+nobase_dist_pixmaps_DATA = \
+	$(srcdir)/gajim.ico
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/pixmaps/gajim.icns b/data/pixmaps/gajim.icns
deleted file mode 100644
index 37516d5e8..000000000
--- a/data/pixmaps/gajim.icns
+++ /dev/null
diff --git a/data/pixmaps/person.png b/data/pixmaps/person.png
deleted file mode 100644
index f2169a8a2..000000000
--- a/data/pixmaps/person.png
+++ /dev/null
diff --git a/debian/changelog b/debian/changelog
index 1db2d4093..8850d39ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+gajim (0.13.1-1) unstable; urgency=low
+
+  * New upstream release. Closes: #559905
+  * Update PyGTK requirement to 2.12.0 minimum
+  * Fix filetransfer proxies testing, keepalive handling, memory leak.
+    Closes: #524514
+  * Better connection. Closes: #547267
+  * Fix proxy test on startup. Closes: #453910
+  * Fix sound playing. Closes: #527275
+  * Update debhelper compatibility level to 7
+
+ -- Yann Leboulanger <asterix@lagaule.org>  Sun, 29 Nov 2009 01:21:04 +0100
+
+gajim (0.12.5-1) unstable; urgency=low
+
+  * New upstream release which fixes file transfer. Closes: #544466
+  * Fix history manager. Closes: #539109
+  * Fix custom host / port usage. Closes: #539267
+  * update python-gnome* dependancies. Closes: #541553
+
+ -- Yann Leboulanger <asterix@lagaule.org>  Sun, 08 Aug 2009 00:06:15 +0100
+
+gajim (0.12.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * OS info are now caches. Closes: #509675
+  * keepalive system has been improved. Closes: #521144
+  * Recommends python-crypto for encryption. Closes: #513892
+  * update to 3.8.2 Debian Policy
+  * update to debhelper V6
+  * added watch file
+
+ -- Yann Leboulanger <asterix@lagaule.org>  Sun, 24 Jun 2009 20:46:15 +0100
+
 gajim (0.12.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index b8626c4cf..7f8f011eb 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 1c7c58c88..8832ee1b2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,21 @@
 Source: gajim
 Section: net
 Priority: optional
-Maintainer: Yann Le Boulanger <asterix@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 (>= 0.40.1), imagemagick, python-central (>= 0.5), libdbus-1-dev
+Maintainer: Yann Leboulanger <asterix@lagaule.org>
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, python-central (>= 0.5)
 Build-Conflicts: python2.3
 XS-Python-Version: >= 2.4
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Homepage: http://www.gajim.org
-Vcs-Svn: svn://svn.gajim.org/gajim/
-Vcs-Browser: http://trac.gajim.org/browser
+Vcs-Hg: http://hg.gajim.org/gajim/
+Vcs-Browser: http://hg.gajim.org/gajim/file
 
 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.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)
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils
+Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto
+Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng
 Description: Jabber client written in PyGTK
  Gajim is a Jabber client. It has a tabbed user interface with normal chats,
  group chats, and has many features such as, TLS, GPG, SSL, multiple accounts,
diff --git a/debian/copyright b/debian/copyright
index a4b8e0515..ccf62f645 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,12 @@ This package was debianized by Yann Leboulanger asterix@lagaule.org on
 Wed, 16 Jun 2005 20:00:00 +0100.
 
 It was downloaded from:
- http://www.gajim.org/downloads/gajim-0.11.0.tar.gz
+ http://www.gajim.org/downloads/
 
 Upstream Authors:
       - Yann Le Boulanger <asterix@lagaule.org>
-      - Dimitur Kirov <dkirov@gmail.com>
-      - Travis Shirk <travis@pobox.com>
+      - Jean-Marie Traissard <jim@lapin.org>
+      - Stephan Erb <steve-e@h3c.de>
  
 
 Copyright: (c) 2003-2009 Gajim Team
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
  
 You should have received a copy of the GNU General Public License
-along with Debian system; see the file /usr/share/common-licenses/GPL. If not,
+along with Debian system; see the file /usr/share/common-licenses/GPL-3. If not,
 write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA  02110-1301, USA.
 
diff --git a/debian/gajim.lintian b/debian/gajim.lintian
deleted file mode 100644
index 6380cf3a9..000000000
--- a/debian/gajim.lintian
+++ /dev/null
@@ -1 +0,0 @@
-gajim binary: script-not-executable
diff --git a/debian/gajim.manpages b/debian/gajim.manpages
index 435281b21..4cc64feca 100644
--- a/debian/gajim.manpages
+++ b/debian/gajim.manpages
@@ -1 +1,3 @@
 data/gajim.1
+data/gajim-remote.1
+debian/gajim-history-manager.1
diff --git a/debian/rules b/debian/rules
index f5af9a300..0d45fd06c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,4 +16,3 @@ binary-install/gajim::
 	rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py*
 	dh_pysupport -pgajim
 	convert $(DEB_DESTDIR)/usr/share/pixmaps/gajim.png -resize 32x32 $(DEB_DESTDIR)/usr/share/pixmaps/gajim.xpm
-	install -m 0644 debian/gajim.lintian $(DEB_DESTDIR)/usr/share/lintian/overrides/gajim
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 000000000..e61275c37
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1,7 @@
+iconsdir = $(pkgdatadir)/icons
+nobase_dist_icons_DATA = $(srcdir)/*/*/*/*
+
+systemiconsdir = $(datadir)/icons
+nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/gajim.*
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/pixmaps/gajim_about.png b/icons/hicolor/128x128/apps/gajim-about.png
index 7f16c9c8b..7f16c9c8b 100644
--- a/data/pixmaps/gajim_about.png
+++ b/icons/hicolor/128x128/apps/gajim-about.png
diff --git a/data/pixmaps/cam_active.png b/icons/hicolor/16x16/actions/gajim-cam_active.png
index 00f40d62b..00f40d62b 100644
--- a/data/pixmaps/cam_active.png
+++ b/icons/hicolor/16x16/actions/gajim-cam_active.png
diff --git a/data/pixmaps/cam_inactive.png b/icons/hicolor/16x16/actions/gajim-cam_inactive.png
index b4da5e84c..b4da5e84c 100644
--- a/data/pixmaps/cam_inactive.png
+++ b/icons/hicolor/16x16/actions/gajim-cam_inactive.png
diff --git a/icons/hicolor/16x16/actions/gajim-earth.png b/icons/hicolor/16x16/actions/gajim-earth.png
new file mode 100644
index 000000000..6c67fb76f
--- /dev/null
+++ b/icons/hicolor/16x16/actions/gajim-earth.png
diff --git a/data/pixmaps/kbd_input.png b/icons/hicolor/16x16/actions/gajim-kbd_input.png
index 782395a57..782395a57 100644
--- a/data/pixmaps/kbd_input.png
+++ b/icons/hicolor/16x16/actions/gajim-kbd_input.png
diff --git a/data/pixmaps/mic_active.png b/icons/hicolor/16x16/actions/gajim-mic_active.png
index 4fdcf6990..4fdcf6990 100644
--- a/data/pixmaps/mic_active.png
+++ b/icons/hicolor/16x16/actions/gajim-mic_active.png
diff --git a/data/pixmaps/mic_inactive.png b/icons/hicolor/16x16/actions/gajim-mic_inactive.png
index f2882d051..f2882d051 100644
--- a/data/pixmaps/mic_inactive.png
+++ b/icons/hicolor/16x16/actions/gajim-mic_inactive.png
diff --git a/data/pixmaps/muc_separator.png b/icons/hicolor/16x16/actions/gajim-muc_separator.png
index f54797c8e..f54797c8e 100644
--- a/data/pixmaps/muc_separator.png
+++ b/icons/hicolor/16x16/actions/gajim-muc_separator.png
diff --git a/data/pixmaps/receipt_missing.png b/icons/hicolor/16x16/actions/gajim-receipt_missing.png
index c157f5177..c157f5177 100644
--- a/data/pixmaps/receipt_missing.png
+++ b/icons/hicolor/16x16/actions/gajim-receipt_missing.png
diff --git a/data/pixmaps/security-high.png b/icons/hicolor/16x16/actions/gajim-security_high.png
index 8f229a037..8f229a037 100644
--- a/data/pixmaps/security-high.png
+++ b/icons/hicolor/16x16/actions/gajim-security_high.png
diff --git a/data/pixmaps/security-low.png b/icons/hicolor/16x16/actions/gajim-security_low.png
index 35385cf2e..35385cf2e 100644
--- a/data/pixmaps/security-low.png
+++ b/icons/hicolor/16x16/actions/gajim-security_low.png
diff --git a/data/pixmaps/upload.png b/icons/hicolor/16x16/actions/gajim-upload.png
index c3b373325..c3b373325 100644
--- a/data/pixmaps/upload.png
+++ b/icons/hicolor/16x16/actions/gajim-upload.png
diff --git a/data/pixmaps/agents/aim.png b/icons/hicolor/32x32/categories/gajim-agent-aim.png
index 068609550..068609550 100644
--- a/data/pixmaps/agents/aim.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-aim.png
diff --git a/data/pixmaps/agents/bytestreams.png b/icons/hicolor/32x32/categories/gajim-agent-bytestreams.png
index 746c7bd71..746c7bd71 100644
--- a/data/pixmaps/agents/bytestreams.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-bytestreams.png
diff --git a/data/pixmaps/agents/conference.png b/icons/hicolor/32x32/categories/gajim-agent-conference.png
index 60d83ee5c..60d83ee5c 100644
--- a/data/pixmaps/agents/conference.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-conference.png
diff --git a/data/pixmaps/agents/disc.png b/icons/hicolor/32x32/categories/gajim-agent-disc.png
index 6a6d9cf42..6a6d9cf42 100644
--- a/data/pixmaps/agents/disc.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-disc.png
diff --git a/data/pixmaps/agents/error.png b/icons/hicolor/32x32/categories/gajim-agent-error.png
index 62714e189..62714e189 100644
--- a/data/pixmaps/agents/error.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-error.png
diff --git a/data/pixmaps/agents/facebook.png b/icons/hicolor/32x32/categories/gajim-agent-facebook.png
index 65695e9e5..65695e9e5 100644
--- a/data/pixmaps/agents/facebook.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-facebook.png
diff --git a/data/pixmaps/agents/gadu-gadu.png b/icons/hicolor/32x32/categories/gajim-agent-gadu-gadu.png
index f8b342998..f8b342998 100644
--- a/data/pixmaps/agents/gadu-gadu.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-gadu-gadu.png
diff --git a/data/pixmaps/agents/http-ws.png b/icons/hicolor/32x32/categories/gajim-agent-http-ws.png
index acbe61505..acbe61505 100644
--- a/data/pixmaps/agents/http-ws.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-http-ws.png
diff --git a/data/pixmaps/agents/icq.png b/icons/hicolor/32x32/categories/gajim-agent-icq.png
index 1023343a2..1023343a2 100644
--- a/data/pixmaps/agents/icq.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-icq.png
diff --git a/data/pixmaps/agents/irc.png b/icons/hicolor/32x32/categories/gajim-agent-irc.png
index 2789c78da..2789c78da 100644
--- a/data/pixmaps/agents/irc.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-irc.png
diff --git a/data/pixmaps/agents/jabber.png b/icons/hicolor/32x32/categories/gajim-agent-jabber.png
index e3d8dcdcd..e3d8dcdcd 100644
--- a/data/pixmaps/agents/jabber.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-jabber.png
diff --git a/data/pixmaps/agents/jud.png b/icons/hicolor/32x32/categories/gajim-agent-jud.png
index f4b47676b..f4b47676b 100644
--- a/data/pixmaps/agents/jud.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-jud.png
diff --git a/data/pixmaps/agents/mail.png b/icons/hicolor/32x32/categories/gajim-agent-mail.png
index 20efb6f90..20efb6f90 100644
--- a/data/pixmaps/agents/mail.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-mail.png
diff --git a/data/pixmaps/agents/mrim.png b/icons/hicolor/32x32/categories/gajim-agent-mrim.png
index 772c80ecc..772c80ecc 100644
--- a/data/pixmaps/agents/mrim.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-mrim.png
diff --git a/data/pixmaps/agents/msn.png b/icons/hicolor/32x32/categories/gajim-agent-msn.png
index 097069952..097069952 100644
--- a/data/pixmaps/agents/msn.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-msn.png
diff --git a/data/pixmaps/agents/pubsub.png b/icons/hicolor/32x32/categories/gajim-agent-pubsub.png
index 09c789420..09c789420 100644
--- a/data/pixmaps/agents/pubsub.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-pubsub.png
diff --git a/data/pixmaps/agents/rss.png b/icons/hicolor/32x32/categories/gajim-agent-rss.png
index 736622647..736622647 100644
--- a/data/pixmaps/agents/rss.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-rss.png
diff --git a/data/pixmaps/agents/sip.png b/icons/hicolor/32x32/categories/gajim-agent-sip.png
index 1efadf8c4..1efadf8c4 100644
--- a/data/pixmaps/agents/sip.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-sip.png
diff --git a/data/pixmaps/agents/sms.png b/icons/hicolor/32x32/categories/gajim-agent-sms.png
index 08b681f5c..08b681f5c 100644
--- a/data/pixmaps/agents/sms.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-sms.png
diff --git a/data/pixmaps/agents/tv.png b/icons/hicolor/32x32/categories/gajim-agent-tv.png
index 565c8ef45..565c8ef45 100644
--- a/data/pixmaps/agents/tv.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-tv.png
diff --git a/data/pixmaps/agents/weather.png b/icons/hicolor/32x32/categories/gajim-agent-weather.png
index 40f6466ad..40f6466ad 100644
--- a/data/pixmaps/agents/weather.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-weather.png
diff --git a/data/pixmaps/agents/yahoo.png b/icons/hicolor/32x32/categories/gajim-agent-yahoo.png
index 7f6d02e51..7f6d02e51 100644
--- a/data/pixmaps/agents/yahoo.png
+++ b/icons/hicolor/32x32/categories/gajim-agent-yahoo.png
diff --git a/data/pixmaps/events/chat_msg_recv.png b/icons/hicolor/48x48/actions/gajim-chat_msg_recv.png
index d54d2f676..d54d2f676 100644
--- a/data/pixmaps/events/chat_msg_recv.png
+++ b/icons/hicolor/48x48/actions/gajim-chat_msg_recv.png
diff --git a/data/pixmaps/events/connection_lost.png b/icons/hicolor/48x48/actions/gajim-connection_lost.png
index 6e62e8449..6e62e8449 100644
--- a/data/pixmaps/events/connection_lost.png
+++ b/icons/hicolor/48x48/actions/gajim-connection_lost.png
diff --git a/data/pixmaps/events/ft_done.png b/icons/hicolor/48x48/actions/gajim-ft_done.png
index e28ebd42a..e28ebd42a 100644
--- a/data/pixmaps/events/ft_done.png
+++ b/icons/hicolor/48x48/actions/gajim-ft_done.png
diff --git a/data/pixmaps/events/ft_error.png b/icons/hicolor/48x48/actions/gajim-ft_error.png
index 1f53c23b5..1f53c23b5 100644
--- a/data/pixmaps/events/ft_error.png
+++ b/icons/hicolor/48x48/actions/gajim-ft_error.png
diff --git a/data/pixmaps/events/ft_request.png b/icons/hicolor/48x48/actions/gajim-ft_request.png
index b17e766fb..b17e766fb 100644
--- a/data/pixmaps/events/ft_request.png
+++ b/icons/hicolor/48x48/actions/gajim-ft_request.png
diff --git a/data/pixmaps/events/ft_stopped.png b/icons/hicolor/48x48/actions/gajim-ft_stopped.png
index 1f982d287..1f982d287 100644
--- a/data/pixmaps/events/ft_stopped.png
+++ b/icons/hicolor/48x48/actions/gajim-ft_stopped.png
diff --git a/data/pixmaps/events/gc_invitation.png b/icons/hicolor/48x48/actions/gajim-gc_invitation.png
index d0c53c493..d0c53c493 100644
--- a/data/pixmaps/events/gc_invitation.png
+++ b/icons/hicolor/48x48/actions/gajim-gc_invitation.png
diff --git a/data/pixmaps/events/new_email_recv.png b/icons/hicolor/48x48/actions/gajim-new_email_recv.png
index a1bdd1274..a1bdd1274 100644
--- a/data/pixmaps/events/new_email_recv.png
+++ b/icons/hicolor/48x48/actions/gajim-new_email_recv.png
diff --git a/data/pixmaps/events/priv_msg_recv.png b/icons/hicolor/48x48/actions/gajim-priv_msg_recv.png
index fc0fad37e..fc0fad37e 100644
--- a/data/pixmaps/events/priv_msg_recv.png
+++ b/icons/hicolor/48x48/actions/gajim-priv_msg_recv.png
diff --git a/data/pixmaps/security-high-big.png b/icons/hicolor/48x48/actions/gajim-security_high.png
index beedf016c..beedf016c 100644
--- a/data/pixmaps/security-high-big.png
+++ b/icons/hicolor/48x48/actions/gajim-security_high.png
diff --git a/data/pixmaps/security-low-big.png b/icons/hicolor/48x48/actions/gajim-security_low.png
index 64a53201a..64a53201a 100644
--- a/data/pixmaps/security-low-big.png
+++ b/icons/hicolor/48x48/actions/gajim-security_low.png
diff --git a/data/pixmaps/events/single_msg_recv.png b/icons/hicolor/48x48/actions/gajim-single_msg_recv.png
index 70792f546..70792f546 100644
--- a/data/pixmaps/events/single_msg_recv.png
+++ b/icons/hicolor/48x48/actions/gajim-single_msg_recv.png
diff --git a/data/pixmaps/events/subscription_request.png b/icons/hicolor/48x48/actions/gajim-subscription_request.png
index f3eeb37da..f3eeb37da 100644
--- a/data/pixmaps/events/subscription_request.png
+++ b/icons/hicolor/48x48/actions/gajim-subscription_request.png
diff --git a/data/pixmaps/events/unsubscribed.png b/icons/hicolor/48x48/actions/gajim-unsubscribed.png
index f9e93bf17..f9e93bf17 100644
--- a/data/pixmaps/events/unsubscribed.png
+++ b/icons/hicolor/48x48/actions/gajim-unsubscribed.png
diff --git a/data/pixmaps/gajim.png b/icons/hicolor/64x64/apps/gajim.png
index 9dac8652a..9dac8652a 100644
--- a/data/pixmaps/gajim.png
+++ b/icons/hicolor/64x64/apps/gajim.png
diff --git a/icons/hicolor/index.theme b/icons/hicolor/index.theme
new file mode 100644
index 000000000..1c8121953
--- /dev/null
+++ b/icons/hicolor/index.theme
@@ -0,0 +1,1662 @@
+[Icon Theme]
+Name=Hicolor
+Comment=Fallback icon theme
+Hidden=true
+Directories=16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/intl,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/filesystems,22x22/intl,22x22/mimetypes,22x22/places,22x22/status,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/intl,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/filesystems,32x32/intl,32x32/mimetypes,32x32/places,32x32/status,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/emblems,36x36/emotes,36x36/filesystems,36x36/intl,36x36/mimetypes,36x36/places,36x36/status,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/filesystems,48x48/intl,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/animations,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/filesystems,64x64/intl,64x64/mimetypes,64x64/places,64x64/status,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stock/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/animations,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/filesystems,72x72/intl,72x72/mimetypes,72x72/places,72x72/status,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/animations,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/filesystems,96x96/intl,96x96/mimetypes,96x96/places,96x96/status,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/animations,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/filesystems,128x128/intl,128x128/mimetypes,128x128/places,128x128/status,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigation,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/animations,192x192/apps,192x192/categories,192x192/devices,192x192/emblems,192x192/emotes,192x192/filesystems,192x192/intl,192x192/mimetypes,192x192/places,192x192/status,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,256x256/actions,256x256/animations,256x256/apps,256x256/categories,256x256/devices,256x256/emblems,256x256/emotes,256x256/filesystems,256x256/intl,256x256/mimetypes,256x256/places,256x256/status,256x256/stock/chart,256x256/stock/code,256x256/stock/data,256x256/stock/form,256x256/stock/image,256x256/stock/io,256x256/stock/media,256x256/stock/navigation,256x256/stock/net,256x256/stock/object,256x256/stock/table,256x256/stock/text,scalable/actions,scalable/animations,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/filesystems,scalable/intl,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text
+
+
+[16x16/actions]
+Size=16
+Context=Actions
+Type=Threshold
+
+[16x16/animations]
+Size=16
+Context=Animations
+Type=Threshold
+
+[16x16/apps]
+Size=16
+Context=Applications
+Type=Threshold
+
+[16x16/categories]
+Size=16
+Context=Categories
+Type=Threshold
+
+[16x16/devices]
+Size=16
+Context=Devices
+Type=Threshold
+
+[16x16/emblems]
+Size=16
+Context=Emblems
+Type=Threshold
+
+[16x16/emotes]
+Size=16
+Context=Emotes
+Type=Threshold
+
+[16x16/filesystems]
+Size=16
+Context=FileSystems
+Type=Threshold
+
+[16x16/intl]
+Size=16
+Context=International
+Type=Threshold
+
+[16x16/mimetypes]
+Size=16
+Context=MimeTypes
+Type=Threshold
+
+[16x16/places]
+Size=16
+Context=Places
+Type=Threshold
+
+[16x16/status]
+Size=16
+Context=Status
+Type=Threshold
+
+[16x16/stock/chart]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/code]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/data]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/form]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/image]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/io]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/media]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/navigation]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/net]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/object]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/table]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/text]
+Size=16
+Context=Stock
+Type=Threshold
+
+[22x22/actions]
+Size=22
+Context=Actions
+Type=Threshold
+
+[22x22/animations]
+Size=22
+Context=Animations
+Type=Threshold
+
+[22x22/apps]
+Size=22
+Context=Applications
+Type=Threshold
+
+[22x22/categories]
+Size=22
+Context=Categories
+Type=Threshold
+
+[22x22/devices]
+Size=22
+Context=Devices
+Type=Threshold
+
+[22x22/emblems]
+Size=22
+Context=Emblems
+Type=Threshold
+
+[22x22/emotes]
+Size=22
+Context=Emotes
+Type=Threshold
+
+[22x22/filesystems]
+Size=22
+Context=FileSystems
+Type=Threshold
+
+[22x22/intl]
+Size=22
+Context=International
+Type=Threshold
+
+[22x22/mimetypes]
+Size=22
+Context=MimeTypes
+Type=Threshold
+
+[22x22/places]
+Size=22
+Context=Places
+Type=Threshold
+
+[22x22/status]
+Size=22
+Context=Status
+Type=Threshold
+
+[22x22/stock/chart]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/code]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/data]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/form]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/image]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/io]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/media]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/navigation]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/net]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/object]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/table]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/text]
+Size=22
+Context=Stock
+Type=Threshold
+
+[24x24/actions]
+Size=24
+Context=Actions
+Type=Threshold
+
+[24x24/animations]
+Size=24
+Context=Animations
+Type=Threshold
+
+[24x24/apps]
+Size=24
+Context=Applications
+Type=Threshold
+
+[24x24/categories]
+Size=24
+Context=Categories
+Type=Threshold
+
+[24x24/devices]
+Size=24
+Context=Devices
+Type=Threshold
+
+[24x24/emblems]
+Size=24
+Context=Emblems
+Type=Threshold
+
+[24x24/emotes]
+Size=24
+Context=Emotes
+Type=Threshold
+
+[24x24/filesystems]
+Size=24
+Context=FileSystems
+Type=Threshold
+
+[24x24/intl]
+Size=24
+Context=International
+Type=Threshold
+
+[24x24/mimetypes]
+Size=24
+Context=MimeTypes
+Type=Threshold
+
+[24x24/places]
+Size=24
+Context=Places
+Type=Threshold
+
+[24x24/status]
+Size=24
+Context=Status
+Type=Threshold
+
+[24x24/stock/chart]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/code]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/data]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/form]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/image]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/io]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/media]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/navigation]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/net]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/object]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/table]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/text]
+Size=24
+Context=Stock
+Type=Threshold
+
+[32x32/actions]
+Size=32
+Context=Actions
+Type=Threshold
+
+[32x32/animations]
+Size=32
+Context=Animations
+Type=Threshold
+
+[32x32/apps]
+Size=32
+Context=Applications
+Type=Threshold
+
+[32x32/categories]
+Size=32
+Context=Categories
+Type=Threshold
+
+[32x32/devices]
+Size=32
+Context=Devices
+Type=Threshold
+
+[32x32/emblems]
+Size=32
+Context=Emblems
+Type=Threshold
+
+[32x32/emotes]
+Size=32
+Context=Emotes
+Type=Threshold
+
+[32x32/filesystems]
+Size=32
+Context=FileSystems
+Type=Threshold
+
+[32x32/intl]
+Size=32
+Context=International
+Type=Threshold
+
+[32x32/mimetypes]
+Size=32
+Context=MimeTypes
+Type=Threshold
+
+[32x32/places]
+Size=32
+Context=Places
+Type=Threshold
+
+[32x32/status]
+Size=32
+Context=Status
+Type=Threshold
+
+[32x32/stock/chart]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/code]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/data]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/form]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/image]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/io]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/media]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/navigation]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/net]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/object]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/table]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/text]
+Size=32
+Context=Stock
+Type=Threshold
+
+[36x36/actions]
+Size=36
+Context=Actions
+Type=Threshold
+
+[36x36/animations]
+Size=36
+Context=Animations
+Type=Threshold
+
+[36x36/apps]
+Size=36
+Context=Applications
+Type=Threshold
+
+[36x36/categories]
+Size=36
+Context=Categories
+Type=Threshold
+
+[36x36/devices]
+Size=36
+Context=Devices
+Type=Threshold
+
+[36x36/emblems]
+Size=36
+Context=Emblems
+Type=Threshold
+
+[36x36/emotes]
+Size=36
+Context=Emotes
+Type=Threshold
+
+[36x36/filesystems]
+Size=36
+Context=FileSystems
+Type=Threshold
+
+[36x36/intl]
+Size=36
+Context=International
+Type=Threshold
+
+[36x36/mimetypes]
+Size=36
+Context=MimeTypes
+Type=Threshold
+
+[36x36/places]
+Size=36
+Context=Places
+Type=Threshold
+
+[36x36/status]
+Size=36
+Context=Status
+Type=Threshold
+
+[36x36/stock/chart]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/code]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/data]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/form]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/image]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/io]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/media]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/navigation]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/net]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/object]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/table]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/text]
+Size=36
+Context=Stock
+Type=Threshold
+
+[48x48/actions]
+Size=48
+Context=Actions
+Type=Threshold
+
+[48x48/animations]
+Size=48
+Context=Animations
+Type=Threshold
+
+[48x48/apps]
+Size=48
+Context=Applications
+Type=Threshold
+
+[48x48/categories]
+Size=48
+Context=Categories
+Type=Threshold
+
+[48x48/devices]
+Size=48
+Context=Devices
+Type=Threshold
+
+[48x48/emblems]
+Size=48
+Context=Emblems
+Type=Threshold
+
+[48x48/emotes]
+Size=48
+Context=Emotes
+Type=Threshold
+
+[48x48/filesystems]
+Size=48
+Context=FileSystems
+Type=Threshold
+
+[48x48/intl]
+Size=48
+Context=International
+Type=Threshold
+
+[48x48/mimetypes]
+Size=48
+Context=MimeTypes
+Type=Threshold
+
+[48x48/places]
+Size=48
+Context=Places
+Type=Threshold
+
+[48x48/status]
+Size=48
+Context=Status
+Type=Threshold
+
+[48x48/stock/chart]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/code]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/data]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/form]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/image]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/io]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/media]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/navigation]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/net]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/object]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/table]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/text]
+Size=48
+Context=Stock
+Type=Threshold
+
+[64x64/actions]
+Size=64
+Context=Actions
+Type=Threshold
+
+[64x64/animations]
+Size=64
+Context=Animations
+Type=Threshold
+
+[64x64/apps]
+Size=64
+Context=Applications
+Type=Threshold
+
+[64x64/categories]
+Size=64
+Context=Categories
+Type=Threshold
+
+[64x64/devices]
+Size=64
+Context=Devices
+Type=Threshold
+
+[64x64/emblems]
+Size=64
+Context=Emblems
+Type=Threshold
+
+[64x64/emotes]
+Size=64
+Context=Emotes
+Type=Threshold
+
+[64x64/filesystems]
+Size=64
+Context=FileSystems
+Type=Threshold
+
+[64x64/intl]
+Size=64
+Context=International
+Type=Threshold
+
+[64x64/mimetypes]
+Size=64
+Context=MimeTypes
+Type=Threshold
+
+[64x64/places]
+Size=64
+Context=Places
+Type=Threshold
+
+[64x64/status]
+Size=64
+Context=Status
+Type=Threshold
+
+[64x64/stock/chart]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/code]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/data]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/form]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/image]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/io]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/media]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/navigation]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/net]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/object]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/table]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/text]
+Size=64
+Context=Stock
+Type=Threshold
+[72x72/actions]
+Size=72
+Context=Actions
+Type=Threshold
+
+[72x72/animations]
+Size=72
+Context=Animations
+Type=Threshold
+
+[72x72/apps]
+Size=72
+Context=Applications
+Type=Threshold
+
+[72x72/categories]
+Size=72
+Context=Categories
+Type=Threshold
+
+[72x72/devices]
+Size=72
+Context=Devices
+Type=Threshold
+
+[72x72/emblems]
+Size=72
+Context=Emblems
+Type=Threshold
+
+[72x72/emotes]
+Size=72
+Context=Emotes
+Type=Threshold
+
+[72x72/filesystems]
+Size=72
+Context=FileSystems
+Type=Threshold
+
+[72x72/intl]
+Size=72
+Context=International
+Type=Threshold
+
+[72x72/mimetypes]
+Size=72
+Context=MimeTypes
+Type=Threshold
+
+[72x72/places]
+Size=72
+Context=Places
+Type=Threshold
+
+[72x72/status]
+Size=72
+Context=Status
+Type=Threshold
+
+[72x72/stock/chart]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/code]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/data]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/form]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/image]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/io]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/media]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/navigation]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/net]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/object]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/table]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/text]
+Size=72
+Context=Stock
+Type=Threshold
+
+[96x96/actions]
+Size=96
+Context=Actions
+Type=Threshold
+
+[96x96/animations]
+Size=96
+Context=Animations
+Type=Threshold
+
+[96x96/apps]
+Size=96
+Context=Applications
+Type=Threshold
+
+[96x96/categories]
+Size=96
+Context=Categories
+Type=Threshold
+
+[96x96/devices]
+Size=96
+Context=Devices
+Type=Threshold
+
+[96x96/emblems]
+Size=96
+Context=Emblems
+Type=Threshold
+
+[96x96/emotes]
+Size=96
+Context=Emotes
+Type=Threshold
+
+[96x96/filesystems]
+Size=96
+Context=FileSystems
+Type=Threshold
+
+[96x96/intl]
+Size=96
+Context=International
+Type=Threshold
+
+[96x96/mimetypes]
+Size=96
+Context=MimeTypes
+Type=Threshold
+
+[96x96/places]
+Size=96
+Context=Places
+Type=Threshold
+
+[96x96/status]
+Size=96
+Context=Status
+Type=Threshold
+
+[96x96/stock/chart]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/code]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/data]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/form]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/image]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/io]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/media]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/navigation]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/net]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/object]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/table]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/text]
+Size=96
+Context=Stock
+Type=Threshold
+
+[128x128/actions]
+Size=128
+Context=Actions
+Type=Threshold
+
+[128x128/animations]
+Size=128
+Context=Animations
+Type=Threshold
+
+[128x128/apps]
+Size=128
+Context=Applications
+Type=Threshold
+
+[128x128/categories]
+Size=128
+Context=Categories
+Type=Threshold
+
+[128x128/devices]
+Size=128
+Context=Devices
+Type=Threshold
+
+[128x128/emblems]
+Size=128
+Context=Emblems
+Type=Threshold
+
+[128x128/emotes]
+Size=128
+Context=Emotes
+Type=Threshold
+
+[128x128/filesystems]
+Size=128
+Context=FileSystems
+Type=Threshold
+
+[128x128/intl]
+Size=128
+Context=International
+Type=Threshold
+
+[128x128/mimetypes]
+Size=128
+Context=MimeTypes
+Type=Threshold
+
+[128x128/places]
+Size=128
+Context=Places
+Type=Threshold
+
+[128x128/status]
+Size=128
+Context=Status
+Type=Threshold
+
+[128x128/stock/chart]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/code]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/data]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/form]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/image]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/io]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/media]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/navigation]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/net]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/object]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/table]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/text]
+Size=128
+Context=Stock
+Type=Threshold
+
+[192x192/actions]
+Size=192
+Context=Actions
+Type=Threshold
+
+[192x192/animations]
+Size=192
+Context=Animations
+Type=Threshold
+
+[192x192/apps]
+Size=192
+Context=Applications
+Type=Threshold
+
+[192x192/categories]
+Size=192
+Context=Categories
+Type=Threshold
+
+[192x192/devices]
+Size=192
+Context=Devices
+Type=Threshold
+
+[192x192/emblems]
+Size=192
+Context=Emblems
+Type=Threshold
+
+[192x192/emotes]
+Size=192
+Context=Emotes
+Type=Threshold
+
+[192x192/filesystems]
+Size=192
+Context=FileSystems
+Type=Threshold
+
+[192x192/intl]
+Size=192
+Context=International
+Type=Threshold
+
+[192x192/mimetypes]
+Size=192
+Context=MimeTypes
+Type=Threshold
+
+[192x192/places]
+Size=192
+Context=Places
+Type=Threshold
+
+[192x192/status]
+Size=192
+Context=Status
+Type=Threshold
+
+[192x192/stock/chart]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/code]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/data]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/form]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/image]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/io]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/media]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/navigation]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/net]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/object]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/table]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/text]
+Size=192
+Context=Stock
+Type=Threshold
+
+[256x256/actions]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Actions
+Type=Scalable
+
+[256x256/animations]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Animations
+Type=Scalable
+
+[256x256/apps]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Applications
+Type=Scalable
+
+[256x256/categories]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Categories
+Type=Scalable
+
+[256x256/devices]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Devices
+Type=Scalable
+
+[256x256/emblems]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Emblems
+Type=Scalable
+
+[256x256/emotes]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Emotes
+Type=Scalable
+
+[256x256/filesystems]
+MinSize=64
+Size=256
+MaxSize=256
+Context=FileSystems
+Type=Scalable
+
+[256x256/intl]
+MinSize=64
+Size=256
+MaxSize=256
+Context=International
+Type=Scalable
+
+[256x256/mimetypes]
+MinSize=64
+Size=256
+MaxSize=256
+Context=MimeTypes
+Type=Scalable
+
+[256x256/places]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Places
+Type=Scalable
+
+[256x256/status]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Status
+Type=Scalable
+
+[256x256/stock/chart]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/code]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/data]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/form]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/image]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/io]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/media]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/navigation]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/net]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/object]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/table]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/text]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/actions]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Actions
+Type=Scalable
+
+[scalable/animations]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Animations
+Type=Scalable
+
+[scalable/apps]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Applications
+Type=Scalable
+
+[scalable/categories]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Categories
+Type=Scalable
+
+[scalable/devices]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Devices
+Type=Scalable
+
+[scalable/emblems]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Emblems
+Type=Scalable
+
+[scalable/emotes]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Emotes
+Type=Scalable
+
+[scalable/filesystems]
+MinSize=1
+Size=128
+MaxSize=256
+Context=FileSystems
+Type=Scalable
+
+[scalable/intl]
+MinSize=1
+Size=128
+MaxSize=256
+Context=International
+Type=Scalable
+
+[scalable/mimetypes]
+MinSize=1
+Size=128
+MaxSize=256
+Context=MimeTypes
+Type=Scalable
+
+[scalable/places]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Places
+Type=Scalable
+
+[scalable/status]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Status
+Type=Scalable
+
+[scalable/stock/chart]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/code]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/data]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/form]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/image]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/io]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/media]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/navigation]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/net]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/object]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/table]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/text]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
diff --git a/data/pixmaps/gajim.svg b/icons/hicolor/scalable/apps/gajim.svg
index d8192b73d..d8192b73d 100644
--- a/data/pixmaps/gajim.svg
+++ b/icons/hicolor/scalable/apps/gajim.svg
diff --git a/launch.sh b/launch.sh
index bcb968553..0c73c667c 100755
--- a/launch.sh
+++ b/launch.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd "$(dirname $0)/src"
-exec python -OOt gajim.py $@
+exec python -OOt gajim.py "$@"
diff --git a/po/be.po b/po/be.po
index 417baf264..32c05edaf 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-19 23:42+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -288,9 +288,9 @@ msgstr "Змяніць асабістыя звесткі..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -299,9 +299,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Агульная"
 
@@ -360,21 +360,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Ключ не выбраны"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Ніякі"
 
@@ -530,8 +530,8 @@ msgstr ""
 "Вам можа спатрэбіцца таксама змяніць настаўленні фаервола."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -545,7 +545,7 @@ msgid "Mer_ge accounts"
 msgstr "_Аб'яднаць рахункі"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "_Змяніць імя"
 
@@ -954,7 +954,7 @@ msgstr "Апошняя змена:"
 msgid "New entry received"
 msgstr "Атрыманае новае паведамленне"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Вы атрымалі новае паведамленне:"
 
@@ -1002,12 +1002,12 @@ msgstr "Увядзіце новы пароль:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Увядзіце тэкст новага паведамлення аб змене стану</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Актывізаваны"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Пакой:"
@@ -1102,8 +1102,8 @@ msgstr "Змяніць _групы"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "За_прасіць"
 
@@ -1118,8 +1118,8 @@ msgid "Remo_ve"
 msgstr "Вы_даліць"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Адправіць асаблівы XML"
@@ -1155,8 +1155,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Дазволіць чалавеку _бачыць змены майго стану"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1167,7 +1167,7 @@ msgstr "_Забараніць праглядаць змены майго ста�
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Журнал"
 
@@ -1190,8 +1190,8 @@ msgid "_Subscription"
 msgstr "П_адпіска"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
@@ -1282,7 +1282,7 @@ msgstr ""
 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:820
 msgid "_Continue"
 msgstr "_Працягнуць"
 
@@ -1290,7 +1290,7 @@ msgstr "_Працягнуць"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Адкрыць дырэкторыю з файлам"
 
@@ -1318,7 +1318,7 @@ msgstr ""
 "Шэраг людзей\n"
 "Банер размовы"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Тлусты"
 
@@ -1338,11 +1338,11 @@ msgstr "Настаўленне тэмы Gajim"
 msgid "Gone"
 msgstr "Знік"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Неактыўны"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Нахілены"
 
@@ -1393,7 +1393,7 @@ msgstr "Змяніць _тэму"
 msgid "Configure _Room..."
 msgstr "Настаўленні _пакоя"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Змясціць у закладках"
@@ -1491,8 +1491,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim - Кіраўнік журналаў размоў"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Выдаліць"
 
@@ -1517,7 +1518,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Пошук у базе дадзеных"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Журнал размоў"
 
@@ -1543,7 +1544,7 @@ msgstr "_Весці журнал размоў"
 msgid "Bookmark this room"
 msgstr "_Змясціць у закладках"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
@@ -1570,8 +1571,8 @@ msgstr "Нядаўна:"
 msgid "Room:"
 msgstr "Пакой:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Далучыцца"
 
@@ -1601,7 +1602,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Стан друку:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -1725,17 +1726,26 @@ msgid "Show a list of formattings"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "Ад_правіць"
 
@@ -1879,6 +1889,16 @@ msgid "Configure color and font of the interface"
 msgstr "Настаўленні колераў і шрыфтаў"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "П_аведамленне стану:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Імя чалавека"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1887,34 +1907,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Паказаць _падрабязнасці пошты"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Паказваць _стан у галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1923,7 +1943,7 @@ msgstr ""
 "Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
 "Вызначце, аб якіх зменах стану Вы хочаце ведаць."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1932,7 +1952,7 @@ msgstr ""
 "Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
 "Вызначце, аб якіх зменах стану Вы хочаце паведамляць суразмоўцу."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1940,12 +1960,12 @@ msgstr ""
 "Gajim будзе паведамляць Вам аб сышоўшых людзях у выплыўным вакне ў правым "
 "верхнім куце экрана"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Схаваць кнопкі групавой размовы."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1954,7 +1974,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1962,18 +1982,18 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
 "новых лістоў"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1981,7 +2001,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1989,7 +2009,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае паведамленні аб зменах стану для "
 "кожнага чалавека ў галоўным вакне і ў групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1997,7 +2017,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2005,7 +2025,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2013,14 +2033,14 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2032,14 +2052,14 @@ msgstr ""
 "зважайце, што ў такім разе ніхто з людзей, якіх няма ў Вашым спісе, не зможа "
 "адправіць Вам паведамленне"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2048,7 +2068,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
 "новых лістоў"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2058,13 +2078,13 @@ msgstr ""
 "пратаколаў. (напр., чалавек з MSN будзе мець адпаведныя значкі злучанасці, "
 "адсутнасці, занятасці і г.д. для MSN-карыстальнікаў)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2072,79 +2092,79 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim заменіць ascii-сымболікі (напр., ':)' ) "
 "адпаведнай значкай"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Вакно для аднаго паведамлення:"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Кі_раванне..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "Змяненне рахунка"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Паведамляць аб новай пошце на _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Граць _гук"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Уласцівасці"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Паказваць падзею ў прасторы паведамленняў"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Злучыцца"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "З_ысці"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2152,30 +2172,30 @@ msgstr ""
 "Некаторыя паведамленні ўключаюць афармленне (фармат, колеры і г.д.). Калі "
 "гэтая опцыя ўключаная, Gajim будзе паказваць нефарматаваны тэкст."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Упарадкаваць людзей па стане"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Стан"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Прадвызначаны набор _значак стану:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "Style"
 msgstr "Марнаванне часу"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "Т_эма:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2183,7 +2203,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2191,113 +2211,115 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Ужыць _значкі транспартаў"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Ужыць _сістэмны"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Па атрыманні новай падзеі"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Памылка: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "П_ерад мянушкай:"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "Аўтаматычна змяняць стан на \"_сышоў\" праз:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Гартач:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "_Паказваць нагадванні стану размовы:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Сымболікі:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Кіраўнік файлаў:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Фарбаваць няправільна напісаныя словы"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ігнараваць афармленне ўваходных паведамленняў"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Уваходнае паведамленне:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Паштовая праграма:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Аўтаматычна змяняць стан на \"_недаступны\" праз:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Адкрыць..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Выходнае паведамленне:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Вярнуць звычайныя колеры"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "_Паказваць нагадванні стану размовы:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "П_аведамленне стану:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "Удзельнічаць у _групавой размове"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "Няма ў спісе"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "хвіліны"
 
@@ -2350,7 +2372,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Парадак:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Спіс прыватнасці"
 
@@ -2514,7 +2536,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Уласцівасці</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Гукі</b>"
@@ -2578,8 +2600,8 @@ msgstr "Выдаліць рахунак для Gajim і на _серверы"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "Вы_даліць"
 
@@ -2598,14 +2620,14 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Выдаліць"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_Добра"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr "Выдаліць"
 
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
@@ -2666,7 +2688,7 @@ msgstr "_Дзеянні"
 msgid "_Contents"
 msgstr "_Змест"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Змяніць"
 
@@ -2710,12 +2732,12 @@ msgid "_Add contact"
 msgstr "Дадаць _чалавека"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 #, fuzzy
 msgid "_Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "П_ошук"
 
@@ -2735,10 +2757,6 @@ msgstr "Зарэгістравацца"
 msgid "_Cancel"
 msgstr "_Скасаваць"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_Добра"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2954,331 +2972,319 @@ msgstr "Рэсурс:"
 msgid "Status:"
 msgstr "Стан:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Асабістыя звесткі"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Актывізаваны"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Неактывізаваны"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Лагічнае"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Цэлы лік"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Тэкставае"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Колер"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Назва ўласцівасці"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Значэнне"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Тып"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Няма)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Схаваны"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Вы атрымалі новае паведамленне:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Вы атрымалі новае паведамленне:"
+msgstr[1] "Вы атрымалі новае паведамленне:"
+msgstr[2] "Вы атрымалі новае паведамленне:"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Ангельская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Беларуская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Балгарская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Breton"
 msgstr "Брытонская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Чэшская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Нямецкая"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Грэцкая"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Брытанская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Эсперанта"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Іспанская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Basque"
 msgstr "Басцкая"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Французская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Харвацкая"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Італійская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Нарвежская (бокмал)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Галандская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Нарвежская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Польская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Партугальская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Бразільская партугальская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Расейская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Serbian"
 msgstr "Нямецкая"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Славацкая"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Шведская"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Кітайская (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Мова правапісу"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Няма злучэння"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "дзевяць"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Мянушка"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "_Шрыфт:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Асабістыя звесткі"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Шыфраванне дзейнічае"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Няма ў спісе"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, 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:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "Аўтарызацыя"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Аўтарызацыя"
@@ -3286,58 +3292,58 @@ msgstr "Аўтарызацыя"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3345,22 +3351,22 @@ msgstr ""
 "Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае "
 "паведамленне згубіцца."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
@@ -3369,23 +3375,23 @@ msgstr "%(nick)s цяпер %(status)s"
 msgid "creating logs database"
 msgstr "стварэнне базы журналаў"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s з'яўляецца файлам, але павінна быць дырэкторыя"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim сканчвае работу"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "стварэнне дырэкторыі %s"
@@ -3448,10 +3454,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Выберыце групавыя размовы, з якіх Вы хочаце сысці"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Групавыя размовы"
 
@@ -3562,9 +3568,9 @@ msgid ""
 msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і групаў."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 #, fuzzy
 msgid "default"
 msgstr "Прадвызначана"
@@ -4201,7 +4207,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Выпраўленне хібы Jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4209,125 +4215,125 @@ msgstr ""
 "Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
 "выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова праверкі правапісу"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "усе ці падзеленыя прагаламі станы"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ці 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ці ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сон"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Хутка буду"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Хутка буду."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Ежа"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Ямо, пакіньце мне паведамленне."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Фільм"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Гляджу фільм."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Працую"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Працую."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Я на тэлефоне."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Сышоў"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Я цешуся з жыцця."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Я даступны."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Я магу размаўляць."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Мяне няма."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Бывай!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4336,107 +4342,106 @@ msgstr ""
 "вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
 "ўтрымлівае Вашую мянушку."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "зялёны"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "садавіна"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "чалавек"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "мора"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Няправільны вузел"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Звесткі рэгістрацыі для транспарта %s не прыйшлі ў час"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Зарэгістравацца на %s"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Няправільны Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Такая мянушка не дазволеная: %s"
@@ -4444,77 +4449,77 @@ msgstr "Такая мянушка не дазволеная: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вам забаронена казанне ў гэтай групавой размове."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Стварэнне групавых размоў абмежаванае."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас няма ў спісе ўдзельнікаў."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "цяпер падпісаны на %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запыт адпіскі ад %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "цяпер адпісаны ад %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4654,109 +4659,138 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Немагчыма адправіць пусты файл"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Тэма: %s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Перадалучыцеся самастойна."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Няправільны адказ"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Захаваць у: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Праверце злучэнне альбо паспрабуйце пазней"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Памылка аўтарызацыі з \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Праверце звесткі аўтарызацыі."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Памылка ў часе выдалення спіса прыватнасці"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4765,77 +4799,45 @@ msgstr ""
 "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых "
 "злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Немагчыма адправіць пусты файл"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Тэма: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Людзі"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Не атрымана з-за нябачнага стану"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Назіральнікі"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Транспарты"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Няма ў спісе"
 
@@ -5082,7 +5084,7 @@ msgstr "Магу размаўляць"
 msgid "_Available"
 msgstr "_Тут"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Тут"
 
@@ -5200,48 +5202,48 @@ msgid "has closed the chat window or tab"
 msgstr "закрыў вакно / картку размовы"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s кiБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5249,22 +5251,22 @@ msgstr[0] "Адправіць паведамленне"
 msgstr[1] "Адправіць паведамленне"
 msgstr[2] "Адправіць паведамленне"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5272,7 +5274,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5288,16 +5290,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "памылка: немагчыма прачытаць %s"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "перанос базы журналаў у індэкс"
 
@@ -5306,705 +5308,724 @@ msgstr "перанос базы журналаў у індэкс"
 msgid "XMPP account %s@%s"
 msgstr "рахунка %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "Прыпынена"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Тлусты"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Brave"
 msgstr "Мае "
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Размовы"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Тлусты"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Змест"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Скончаная"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Змест"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Неактывізаваны"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 #, fuzzy
 msgid "Curious"
 msgstr "спасылка"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Выдаліць"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Disappointed"
 msgstr "Адключана"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Dismayed"
 msgstr "Адключана"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Distracted"
 msgstr "Адключана"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Excited"
 msgstr "Актывізаваны"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Група"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "_Вузел:"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "паведамленне"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Актывізаваны"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Нябачны"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "адзін"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "_Вузел:"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Нямецкая"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "_Змяніць"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Адключаны"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Група"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "адзінаццаць"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "Марнаванне часу"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "Апошняя змена:"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "Мянушка"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "Сон"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Вуліца:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Падпісаны"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Час"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "дзевяць"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Няправільны вузел"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Вечар"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "Піша"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "Раніца"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "усе з групы"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "Працую"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Вечар"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "Пакаранне %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "_Далучыцца"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "Працую"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "Працую"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Grooming"
 msgstr "пакой"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Змяненне тэмы"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "Пакаранне %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "Працую"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "Пакаранне %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "З_ысці"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "Прычына"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Прычына"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "Сон"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "Працую"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Гляджу фільм."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Я на тэлефоне."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "Перадача"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "Піша"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 #, fuzzy
 msgid "On a Plane"
 msgstr "У сетцы"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 #, fuzzy
 msgid "On a Train"
 msgstr "Адкрыць _спасылку"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "Працую"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "Піша"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "Працую"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -6024,37 +6045,11 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Вузел, вызначаны опцыяй ft_override_host_to_send, некарэктны, таму "
-"ігнаруецца."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Пароль OpenPGP не вызначаны"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Каб працягваць адпраўку і атрыманне паведамленняў, трэба перадалучыцца."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Памылка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6063,54 +6058,46 @@ msgstr ""
 "%s\n"
 "Мясцовыя паведамленні могуць не працаваць."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Немагчыма стартаваць мясцовы сервіс"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, 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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Немагчыма змяніць стан рахунка \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Вы не злучаны альбо не бачны для іншых. Вы не можаце адправіць паведамленне."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Гэтае паведамленне зашыфраванае]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
@@ -6121,26 +6108,26 @@ msgstr "Немагчыма злучыцца з вузлом: скончыўся
 msgid "Error while adding service. %s"
 msgstr "Памылка дадання сервіса. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Адключана"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "Стандартныя паведамленні стану"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "Уключыць"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6149,215 +6136,215 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Перадалучыцца?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Нягледжаныя падзеі"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Вы пачалі размову ў рахунку %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Вы злучаны з серверам"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Назва рахунка не павінна быць пустой."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Назва рахунка не павінна ўтрымліваць прагалаў."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 #, fuzzy
 msgid "Rename Account"
 msgstr "Кіраванне рахункамі"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID павінны мець форму \"user@servername\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Немагчыма атрымаць сакрэтныя ключы"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Выбар ключоў OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Выберыце Ваш ключ OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Такога рахунка няма"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Вы павінны стварыць рахунак да рэдагавання асабістых звестак."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Немагчыма рэдагаваць асабістыя звесткі ў адлучаным рэжыме."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не падтрымлівае Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Сервер не можа захаваць Вашыя асабістыя звесткі."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Мясцовы рахунак Local ужо існуе."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Змяніць %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Зарэгістравацца на %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Чорны спіс"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Спіс удзельнікаў"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Спіс уладальнікаў"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Спіс адміністратараў"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Прычына"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Мянушка"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Забараніць казанне..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6365,11 +6352,11 @@ msgstr ""
 "<b>Каму Вы хочаце забараніць казанне?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Дадаць ўдзельніка..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6377,11 +6364,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць удзельнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Дадаць уладальніка..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6389,11 +6376,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць уладальнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Дадаць адміністратара..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6401,7 +6388,7 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць адміністратарам?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6418,88 +6405,89 @@ msgstr ""
 "4. domain (гэты домэн user@domain,\n"
 "domain/resource ці адрас паддамена)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Выдаленне рахунка %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Усе"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Няма"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Гэтая закладка мае няправільныя звесткі"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Такая мянушка не дазволеная: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 #, fuzzy
 msgid "Invalid server"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова дададзены"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6510,36 +6498,36 @@ msgstr ""
 "\"Адмысловыя\", альбо пазней, выбраўшы элемент \"Рахункі\" ў меню \"Змяніць"
 "\" галоўнага вакна."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
 "рахунка."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Вызначце сваю новую мянушку:"
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6549,7 +6537,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6557,304 +6545,302 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Актыўны"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Падзея"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Атрыманае першае паведамленне"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Чалавек далучыўся"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Паведамленне адпраўленае"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Новы ліст GMail"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "Тэкст пад гэтай рысаю ёсць тэкстам, які Вы яшчэ не бачылі"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Выйсці"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дзеянні для \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпедыі"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "У адрасе слоўніка не хапае \"%s\", і гэта не Вікі-слоўнік"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адрасе пошуку ў Сеціве не хапае \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Учора"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i дзён таму"
+msgid_plural "%i days ago"
+msgstr[0] "Учора"
+msgstr[1] "Учора"
+msgstr[2] "Учора"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-праграма"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Імя чалавека: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "У групе"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Імя чалавека"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "Вызначыць MOTD"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Паведамленне аб змене стану %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Захаваць гэтае паведамленне аб змене стану"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Вызначце назву гэтага паведамлення аб змене стану"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Адрас AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Нумар GG:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Нумар ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Адрас MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Адрас Yahoo!:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка "
 "%s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Няправільны ID карыстальніка"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "ID карыстальніка не павінны вызначаць рэсурс."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Гэты чалавек ужо ёсць у у кантактным лісце."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "ID карыстальніка:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Jabber-праграма для GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Актыўныя распрацоўнікі:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Былыя распрацоўнікі:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "Падзякі:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Таксама хочам выказаць падзяку ўсім людзям, што збіраюць пакункі з праграмай "
 "для розных сістэмаў."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6865,105 +6851,109 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запыт увагі на рахунак %s ад %s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запыт увагі ад %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы ўжо ўдзельнічаеце ў групавой размове %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Удзельнічаць у групавой размове праз рахунак %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Гэта не групавая размова"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не з'яўляецца сапраўднай назвай групавой размовы."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Пачаць размову з рахунка %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Пачаць размову"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6972,302 +6962,331 @@ msgstr ""
 "хочаце адправіць паведамленне:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Праверце злучэнне з \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Няправільны JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Немагчыма разабраць \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Няправільны пароль"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Вы павінны ўвесці пароль."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Паролі розняцца"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Чалавек прыйшоў"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Новае паведамленне"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Новае асобнае паведамленне"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Новае прыватнае паведамленне"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончаная"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Чалавек змяніў стан"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Асобнае паведамленне"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Адправіць %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Атрымана %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Я %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "Кансоль XML для %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "Кансоль XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Марнаванне часу"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "_Змяніць"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "Вы_даліць"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 #, fuzzy
 msgid "Add"
 msgstr "Адрас"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "_Змяніць"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Дадаць _чалавека"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Выдаліць чалавека з спіса"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Спіс прыватнасці <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Спіс прыватнасці для %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Парадак: %s, дзеянне: %s, тып: %s, значэнне: %s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Парадак: %s, дзеянне: %s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Змяніць правіла</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Спісы прыватнасці для %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Няправільная назва спіса"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Выберыце гукавы файл"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Файлы Wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Выберыце малюнак"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Малюнкі"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Калі %s становіцца:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "калі я "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7275,38 +7294,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7316,31 +7335,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Іншыя"
@@ -7350,25 +7388,25 @@ msgstr "Іншыя"
 msgid "Conference"
 msgstr "Канферэнцыі"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Вы не можаце праглядзець спіс даступных сервісаў, не злучыўшыся з серверам."
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук сервісаў для рахунка %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Пошук сервісаў"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Немагчыма знайсці сервіс"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7376,342 +7414,337 @@ msgstr ""
 "Па вызначаным адрасе няма сервісаў, альбо яны не адказваюць на запыты. "
 "Праверце адрас і паспрабуйце зноў."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Немагчыма праглядзець сервіс"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Прагляд %s для рахунка %s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Праглядзець"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў, якія можна праглядзець."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Выканаць загад..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Зарэ_гістравацца"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук у %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Карыстальнікі"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Апісанне"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Закладка ўжо ўсталяваная"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Закладка паспяхова дададзеная"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
 "вакна."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Падпісаны"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 #, fuzzy
 msgid "Node"
 msgstr "Ніякі"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Новы допіс"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "Падп_ісацца"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Загады: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Шыфраванне OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "_Уваходнае паведамленне:"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "Кіраўнік журналаў"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "Паведамленне адпраўленае"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Паролі розняцца"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Змяненне рахунка"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Адпаведна стану"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Шыфраванне OpenPGP"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "_Уваходнае паведамленне:"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Агульная"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "Здольнасці сервера"
@@ -7728,140 +7761,140 @@ msgstr "Час"
 msgid "Progress"
 msgstr "Ступень выкананасці"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Памер: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Вы"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Адпраўнік: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Атрымальнік: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Захаваць у: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Перадача файла скончаная"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Перадача файла скасаваная"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Немагчыма ўсталяваць злучэнне з атрымальнікам."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Атрымальнік: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Памылка: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Перадача файла спыненая"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Выберыце файл..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Апісанне: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim не можа даступіцца да гэтага файла"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Гэтым файлам карыстаецца іншы працэс."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Тып: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Апісанне: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хоча адправіць Вам файл:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Немагчыма перапісаць наяўны файл \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 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:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Немагчыма запісваць файлы ў дырэкторыю \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Вы не маеце права ствараць файлы ў гэтай дырэкторыі."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7869,32 +7902,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/с)"
 
-#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Няправільны файл"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Назва:"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Адпраўнік:"
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Прыпыніць"
 
@@ -7959,11 +7992,11 @@ msgid ""
 msgstr "Праверце, ці ўсталяваны Pywin32. Вы можаце сцягнуць яго з %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim ужо працуе"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7971,433 +8004,28 @@ msgstr ""
 "Gajim ужо працуе\n"
 "Усё роўна запусціць наноў?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Патрэбны пароль"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Вызначце пароль GPG для рахунка %s."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Няправільны пароль"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
-"Выберыце іншую мянушку:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Хочаце задаволіць гэты запыт?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Хочаце задаволіць гэты запыт?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Памылка злучэння"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "памылка адпраўкі %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Запыт падпіскі"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Паспяховая аўтарызацыя"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Адпісацца"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Немагчыма злучыцца з \"%s\""
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s змяніў мянушку на %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s цяпер %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Пароль няправільны"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Пароль няправільны"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Больш не пытацца"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца "
-"(магчыма, зменная асяроддзя выстаўленая няправільна)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Новая пошта на %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "%d новы ліст"
-msgstr[1] "%d новыя лісты"
-msgstr[2] "%d новых лістоў"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s хоча адправіць Вам файл."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Выдаліць чалавека з спіса"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Памылка чытання файла:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Файл %(filename)s паспяхова атрыманы ад %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Перадача файла %(filename)s для %(name)s спыненая."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "Для кожнага _паведамлення"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Канфлікт імёнаў карыстальнікаў"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Канфлікт імёнаў карыстальнікаў"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Злучэнне"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Шыфраванне адключанае"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Вы не можаце ўдзельнічаць у групавой размове нябачным"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Немагчыма захаваць настаўленні"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Паказвае даведку па вызначаным загадзе"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "загад"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "паказаць даведку па загадзе"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8405,49 +8033,49 @@ msgstr ""
 "Паказаць спіс усіх людзей у кантактным лісце. Звесткі пра кожнага чалавека "
 "друкуюцца на асобным радку"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "рахунак"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "паказаць людзей з пэўнага рахунка"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Паказаць спіс зарэгістраваных рахункаў"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "стан"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "паведамленне"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "паведамленне стану"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8455,22 +8083,22 @@ msgstr ""
 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Прыяры_тэт:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "_Зарэгістраваць новы рахунак"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8479,24 +8107,24 @@ msgstr ""
 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Паказвае вакно, з якога Вы можаце адправіць паведамленне пэўнаму чалавеку"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Калі вызначана, то імя чалавека выбіраецца з спіса гэтага рахунка"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8506,29 +8134,29 @@ msgstr ""
 "рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без "
 "'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "змест паведамлення"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "ключ pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Калі вызначана, паведамленне будзе зашыфраванае адкрытым ключом"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўленае праз гэты рахунак"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8538,135 +8166,135 @@ msgstr ""
 "OpenPGP і рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', "
 "без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тэма"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тэма паведамлення"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Атрымаць падрабязныя звесткі пра чалавека"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID чалавека"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Атрымаць падрабязныя звесткі аб рахунку"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Назва рахунка"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Адправіць файл чалавеку"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Месца файла"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "Калі вызначана, файл будзе адпраўлены праз гэты рахунак"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Паказаць спіс усіх настаўленняў і іх значэнні"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Выстаўляе значэнне 'ключа' ў 'значэнне'"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ключ=значэнне"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'ключ' ёсць назваю настаўлення, 'значэнне' ёсць выстаўляемым значэннем"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Выдаляе ўласцівасць"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "назва выдаляемай уласцівасці"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запісвае бягучыя настаўленні Gajim у файл .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Дадаць чалавека ў спіс"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Дадаць новага чалавека для гэтага рахунка"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Вяртае бягучы стан (глабальны, калі не вызначаны рахунак)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Вяртае колькасць нечытаных паведамленняў"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Адкрыць вакно 'Пачаць размову'"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Пачаць размову для рахунка"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Адправіць асаблівы XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "Адправіць XML"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8674,77 +8302,77 @@ msgstr ""
 "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
 "адпраўлены на ўсе рахункі"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Апрацоўваць спасылкі xmpp:/"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "спасылка"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "змест паведамлення"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Увайсці ў размоўны пакой"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "пакой"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Пакой:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "мянушка"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Паролі розняцца"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Не хапае аргумента \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8753,31 +8381,31 @@ msgstr ""
 "'%s' няма ў Вашым спісе.\n"
 "Калі ласка, вызначце рахунак для адпраўкі паведамлення."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "У Вас няма актыўнага рахунка"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s не знойдзены"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8786,7 +8414,7 @@ msgstr ""
 "Карыстанне: %s загад [аргументы]\n"
 "Загад ёсць адным з:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8795,7 +8423,7 @@ msgstr ""
 "Надта шмат аргументаў. \n"
 "Увядзіце \"%s help %s\" для падрабязнейшых звестак"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8804,7 +8432,7 @@ msgstr ""
 "Аргумент \"%s\" не вызначаны. \n"
 "Увядзіце \"%s help %s\" для падрабязных звестак"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Няправільная спасылка"
 
@@ -8834,174 +8462,198 @@ msgstr "Вы не можаце выдаліць актыўную тэму"
 msgid "Please first choose another for your current theme."
 msgstr "Спачатку актывізуйце іншую тэму."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы выйшлі з пакоя \"%s\", альбо \"%s\" сышоў."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "Журнал размоў"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Злучэнне"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s змяніў мянушку на %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Адносіны: "
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s цяпер %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Больш не пытацца"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Змяненне тэмы"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Вызначце новую тэму:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Змена мянушкі"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Вызначце сваю новую мянушку:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Апісанне: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Пакаранне %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
@@ -9027,61 +8679,452 @@ msgid "Details"
 msgstr "Падрабязнасці"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Памылка чытання файла:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Памылка разбору файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Немагчыма запісаць у %s. Сеансы не працуюць"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не з'яўляецца прадвызначанай Jabber-праграмай"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ці Вы хочаце зрабіць Gajim прадвызначанай Jabber-праграмай?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim прадвызначанай Jabber-"
 "праграмай"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Немагчыма захаваць малюнак у фармаце %(type)s. Захаваць як %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Захаваць малюнак як..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
+"Выберыце іншую мянушку:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Хочаце задаволіць гэты запыт?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Хочаце задаволіць гэты запыт?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Памылка злучэння"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "памылка адпраўкі %s ( %s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Запыт падпіскі"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Паспяховая аўтарызацыя"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Адпісацца"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Немагчыма злучыцца з \"%s\""
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Пароль няправільны"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Пароль няправільны"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца "
+"(магчыма, зменная асяроддзя выстаўленая няправільна)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Новая пошта на %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "%d новы ліст"
+msgstr[1] "%d новыя лісты"
+msgstr[2] "%d новых лістоў"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s хоча адправіць Вам файл."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Выдаліць чалавека з спіса"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Памылка чытання файла:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Файл %(filename)s паспяхова атрыманы ад %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Перадача файла %(filename)s для %(name)s спыненая."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Для кожнага _паведамлення"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Канфлікт імёнаў карыстальнікаў"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1721
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Канфлікт імёнаў карыстальнікаў"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s хоча адправіць Вам файл."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Запыт на перадачу файла"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Злучэнне"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Шыфраванне адключанае"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+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/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Немагчыма захаваць настаўленні"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Патрэбны пароль"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Вызначце пароль GPG для рахунка %s."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Няправільны пароль"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Я хачу дадаць Вас у мой кантактны ліст"
 
@@ -9096,7 +9139,7 @@ msgstr "Людзі"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Дата"
 
@@ -9107,7 +9150,7 @@ msgstr "Мянушка"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Паведамленне"
 
@@ -9133,197 +9176,197 @@ msgstr ""
 "\n"
 "Калі Вы выбралі Так, пачакайце..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Экспартаванне журналаў..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s а %(time)s сказаў: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Вы сапраўды хочаце выдаліць журнал размоў з выбранай асобай?"
 msgstr[1] "Вы сапраўды хочаце выдаліць журналы размоў з выбранымі асобамі?"
 msgstr[2] "Вы сапраўды хочаце выдаліць журналы размоў з выбранымі асобамі?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Гэтае дзеянне не аднаўляецца."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 msgstr[1] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 msgstr[2] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал размоў %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s цяпер %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Памылка: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Цяперашні стан: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Размовы"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Групавыя размовы"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Паведамленні"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змяніў стан"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s прыйшоў"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s сышоў"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новае асобнае паведамленне ад %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новае прыватнае паведамленне ў групавой размове %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "дзевяць"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Чытанне профіля..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 #, fuzzy
 msgid "File is empty"
 msgstr "Месца файла"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 #, fuzzy
 msgid "File does not exist"
 msgstr "Такой групавой размовы няма."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Атрыманыя звесткі"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Вы не можаце абнавіць Вашыя асабістыя звесткі, не злучыўшыся з серверам."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Адпраўленне профіля..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Звесткі НЕ абноўленыя"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Памылка абнаўлення vCard"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9331,46 +9374,51 @@ msgstr ""
 "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
 "абнавіць пазней."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Адпраўлены запыт на падпіску"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9378,28 +9426,28 @@ msgstr ""
 "Змяніўшы свой стан на нябачны, Вы такім чынам выйдзеце з гэтых групавых "
 "размоў. Вы сапраўды хочаце стаць нябачным?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9408,95 +9456,95 @@ msgstr ""
 "Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем "
 "журналаў размоў."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Вы павінны прачытаць іх перад выдаленнем гэтага транспарта."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Транспарты будуць выдаленыя"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэтыя транспарты: %s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Змяніць імя чалавека"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Вызначце новую мянушку для чалавека %s."
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Змяніць назву групы"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Выдаліць групу"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Прызначыць ключ OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Выберыце ключ для гэтага чалавека"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9505,12 +9553,12 @@ msgstr ""
 "прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9519,16 +9567,16 @@ msgstr ""
 "чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас "
 "адлучаным."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Людзі будуць выдаленыя з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9538,32 +9586,32 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Рахункаў няма"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9572,12 +9620,12 @@ msgstr ""
 "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
 "наступных сеансаў."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9587,12 +9635,12 @@ msgstr ""
 "кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
 "Jabber альбо некалькі транспартных рахункаў."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Няправільны файл"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9600,12 +9648,12 @@ msgstr[0] "%s хоча адправіць Вам файл:"
 msgstr[1] "%s хоча адправіць Вам файл:"
 msgstr[2] "%s хоча адправіць Вам файл:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Адправіць %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Зрабіць %s і %s мета-кантактамі"
@@ -9615,164 +9663,164 @@ msgstr "Зрабіць %s і %s мета-кантактамі"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "выкарыстоўвае рахунак %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "рахунку %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "выкарыстоўвае рахунак %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Кіраванне закладкамі..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "рахунка %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "для рахунка %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Праглядзець сервісы..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Усім карыстальнікам"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Усім актыўным карыстальнікам"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Змяніць імя чалавека"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Змяніць _групы"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ад_правіць асобнае паведамленне"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Выканаць загад..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Транспарты"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Паказаць _транспарты"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "Змяніць _імя"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Чалавек адлучыўся"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Кіраўнік журналаў"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Удзельнічаць у групавой размове"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Змяніць паведамленне стану..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Тэма: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9782,7 +9830,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9792,119 +9840,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Змяніць паведамленне стану..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Рэсурс: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s гэтай групавой размовы"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Стан: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Апошняе паведамленне: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " ад %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "Злучэнне"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "Чалавек адлучыўся"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Падпіска: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Тып:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Сцягнуць"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Загрузіць"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Тып: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Перададзена: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Не пачатая"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Спыненая"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Скончаная"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Прыпыненая"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Марнаванне часу"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Перадача"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Гэты сервіс яшчэ не адказаў на запыт падрабязных звестак"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9912,64 +9960,103 @@ msgstr ""
 "Гэты сервіс не дае падрабязных звестак.\n"
 "Хутчэй за ўсё, гэты сервіс састарэлы ці зламаны"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "ад %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Праграмы</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "Вы не цікавіцеся гэтым чалавекам, але ён цікавіцца Вамі"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "Вы цікавіцеся чалавекам, але ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Вы не цікавіцеся чалавекам, і ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы чакаеце адказу на Ваш запыт"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Уваходнае паведамленне:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Выходнае паведамленне:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk+"
+
+#, fuzzy
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Вузел, вызначаны опцыяй ft_override_host_to_send, некарэктны, таму "
+#~ "ігнаруецца."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Пароль OpenPGP не вызначаны"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Каб працягваць адпраўку і атрыманне паведамленняў, трэба перадалучыцца."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Вы не злучаны альбо не бачны для іншых. Вы не можаце адправіць "
+#~ "паведамленне."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Гэтае паведамленне зашыфраванае]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i дзён таму"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Дадаць спецыяльнае _нагадванне"
 
@@ -10541,9 +10628,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "A_fter nickname:"
 #~ msgstr "_Пасля мянушкі:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "П_ерад мянушкай:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Праз пэўны час:"
 
diff --git a/po/be@latin.po b/po/be@latin.po
index a32a33a58..4dcbfe38b 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-19 23:41+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian Latin <i18n@mova.org>\n"
@@ -289,9 +289,9 @@ msgstr "Źmiani asabistyja źviestki..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -300,9 +300,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Ahulnaja"
 
@@ -361,21 +361,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Źviestki pra ciabie, jakija zachoŭvajucca na servery"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Kluč nie abrany"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Nijaki"
 
@@ -532,8 +532,8 @@ msgstr ""
 "Taksama moža spatrebicca źmianić nałady firewalla."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "JID:"
 
@@ -547,7 +547,7 @@ msgid "Mer_ge accounts"
 msgstr "_Źlej konty ŭ adno"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "_Źmiani nazvu"
 
@@ -954,7 +954,7 @@ msgstr "Apošniaja źmiena:"
 msgid "New entry received"
 msgstr "Atrymaŭ novy zapis"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Atrymaŭ novy zapis:"
 
@@ -1002,12 +1002,12 @@ msgstr "Uviadzi novy parol:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Uviadzi novaje paviedamleńnie statusu</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Dziejny"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Pakoj:"
@@ -1102,8 +1102,8 @@ msgstr "Źmiani _hrupy"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "_Zaprasi"
 
@@ -1118,8 +1118,8 @@ msgid "Remo_ve"
 msgstr "_Vydal"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Dasyłaje svoj XML"
@@ -1155,8 +1155,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Dazvol jamu/joj _bačyć moj status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1167,7 +1167,7 @@ msgstr "Za_barani jamu/joj bačyć moj status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Žurnał razmoŭ"
 
@@ -1190,8 +1190,8 @@ msgid "_Subscription"
 msgstr "_Aŭtaryzacyja"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
@@ -1280,7 +1280,7 @@ msgstr "Hetaje dziejańnie anuluje pieradaču fajła i vydalić jaje ź śpisu."
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Pakažy nahadvańnie ŭ vypłyŭnym aknie pa zakančeńni pieradačy fajła"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Praciahni"
 
@@ -1288,7 +1288,7 @@ msgstr "_Praciahni"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Adčyni kataloh z fajłam"
 
@@ -1316,7 +1316,7 @@ msgstr ""
 "Kantakt\n"
 "Baner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Tłusty"
 
@@ -1336,11 +1336,11 @@ msgstr "Kanfihuracyja temy Gajim"
 msgid "Gone"
 msgstr "Vyjšaŭ"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Pasiŭny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Nachileny"
 
@@ -1391,7 +1391,7 @@ msgstr "Źmiani _temu"
 msgid "Configure _Room..."
 msgstr "Kanfihuruj _pakoj"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Stvary zakładku dla hetaja pakoju"
@@ -1490,8 +1490,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Vydal"
 
@@ -1516,7 +1517,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Šukaj u bazie žurnałaŭ"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Žurnał razmoŭ"
 
@@ -1542,7 +1543,7 @@ msgstr "_Zachoŭvaj žurnał razmoŭ"
 msgid "Bookmark this room"
 msgstr "_Stvary zakładku dla hetaja pakoju"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Dałučysia da pakoju"
 
@@ -1569,8 +1570,8 @@ msgstr "Niadaŭna:"
 msgid "Room:"
 msgstr "Pakoj:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Dałučysia"
 
@@ -1600,7 +1601,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Pakazvaj status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1724,17 +1725,26 @@ msgid "Show a list of formattings"
 msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Vyšli"
 
@@ -1879,6 +1889,16 @@ msgid "Configure color and font of the interface"
 msgstr "Kanfihuruj koler i šryft interfejsu"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Pa_viedamleńnie statusu:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Nazva kantaktu"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1887,34 +1907,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Pakazvaj dadatkovyja _padrabiaznaści ab emaiłu"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1924,7 +1944,7 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba "
 "pakazvać u voknach razmoŭ."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1934,7 +1954,7 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba dasyłać "
 "surazmoŭcam."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1942,12 +1962,12 @@ msgstr ""
 "Gajim budzie paviedamlać ab adłučeńni kantaktaŭ ad servera ŭ pravym nižnim "
 "kucie ekranu"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Chavaje knopki ŭ aknie pakoju."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1956,7 +1976,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1964,18 +1984,18 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
 "źviestki pra aŭtaraŭ novych listoŭ"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1983,7 +2003,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1991,7 +2011,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać paviedamleńni statusu "
 "kantaktaŭ u śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1999,7 +2019,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2007,7 +2027,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2015,14 +2035,14 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2034,14 +2054,14 @@ msgstr ""
 "što ŭ takim razie nichto, akramia kantaktaŭ z tvajho śpisu, nia zmoža dasłać "
 "tabie paviedamleńnie"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2050,7 +2070,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
 "źviestki pra aŭtaraŭ novych listoŭ"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2060,13 +2080,13 @@ msgstr ""
 "kožnaha pratakołu (naprykład, kantaktu z MSN buduć adpaviadać ikony statusu "
 "MSN)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2074,79 +2094,79 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie zamianiać ascii-smajliki "
 "(naprykład, ':)' ) na adpaviednyja hrafičnyja smajliki"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Hrupuj vokny:"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "_Kiruj..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "Madyfikacyja kontu"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Paviedamlaj mnie ab novych listach u skryni _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "Asabistyja źviestki"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "_Ahučvaj"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Nałady"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Pakazvaj padzieju ŭ poli nahadvańnia"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Dałučajusia"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Adłučajusia"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2155,30 +2175,30 @@ msgstr ""
 "kolery i h.d.). Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać tekst "
 "biez afarmleńnia."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Paradkuj kantakty pa statusie"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Standartny zbor _ikon statusu:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "Style"
 msgstr "Zatrymana"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2186,7 +2206,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2194,113 +2214,115 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Užyvaj _ikony transpartaŭ"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Užyvaj _zmoŭčany dla systemy"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Kali ŭčyniajecca novaja padzieja"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Tekst pamyłki: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "П_ерад мянушкай:"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "Aŭtamatyčna źmianiać stan na \"_Adyjšoŭ\" praz:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Hartač:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Smajliki:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Kiraŭnik fajłaŭ:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Padśviatlaj słovy z pamyłkami"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ihnaruj padzieji ad kantaktaŭ, jakich niama ŭ śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ihnaruj afarmleńnie ŭvachodnych paviedamleńniaŭ"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Uvachodnaje paviedamleńnie:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Paštovaja prahrama:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Aŭtamatyčna źmianiać stan na \"_Niedastupny\" praz:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Adčyni..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Zychodnaje paviedamleńnie:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Viarni zvyčajnyja kolery"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "Dałučysia da _pakoju"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "chvilinaŭ"
 
@@ -2353,7 +2375,7 @@ msgstr "JID"
 msgid "Order:"
 msgstr "Paradak:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Śpis pryvatnaści"
 
@@ -2517,7 +2539,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Ułaścivaści</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Huki</b>"
@@ -2581,8 +2603,8 @@ msgstr "Vydal kont i dla Gajim, i na _servery"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Vydal"
 
@@ -2601,14 +2623,14 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Vydal"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_Tak"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr "Vydal"
 
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
@@ -2669,7 +2691,7 @@ msgstr "_Dziejańni"
 msgid "_Contents"
 msgstr "_Źmiest"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Źmianić"
 
@@ -2713,12 +2735,12 @@ msgid "_Add contact"
 msgstr "_Dadaj kantakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 #, fuzzy
 msgid "_Information"
 msgstr "Źviestki ab kantakcie"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "Š_ukaj"
 
@@ -2738,10 +2760,6 @@ msgstr "Zarehistrujsia na"
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_Tak"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2960,329 +2978,317 @@ msgstr "Krynica:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Dziejny"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Niadziejny"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Lahičnaja źmiennaja"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Cely lik"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Koler"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Nazva nałady"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Vartaść"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Niama)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Schavany"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Atrymaŭ novy zapis:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Atrymaŭ novy zapis:"
+msgstr[1] "Atrymaŭ novy zapis:"
+msgstr[2] "Atrymaŭ novy zapis:"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Anhielskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Biełaruskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Baŭharskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Breton"
 msgstr "Brytonskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Českaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Niamieckaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Hreckaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Brytanskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Hišpanskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Francuzkaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Charvackaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italijskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Narveskaja (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Halandzkaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Narveskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Partuhalskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brazilskaja partuhalskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Rasiejskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Serbskaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Słavackaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Švedzkaja"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Kitajskaja (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Mova spraŭdžvańnia pravapisu"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Złučeńnie niemahčymaje"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Ty nia možaš dasłać paviedamleńnie, pakul nia złučyśsia z serveram."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "dziaviataja"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Mianuška"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "_Šryft:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Šyfravańnie ŭklučanaje"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Niama ŭ śpisie"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pakoju %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
@@ -3290,58 +3296,58 @@ msgstr "Užyvaj aŭtaryzacyju"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3349,22 +3355,22 @@ msgstr ""
 "Kali ty začyniš hetuju kartku i kali žurnały nie vieducca, to hetaje "
 "paviedamleńnie źniknie nazaŭždy."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
@@ -3373,23 +3379,23 @@ msgstr "%(nick)s maje ciapier status %(status)s"
 msgid "creating logs database"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s jość fajłam, ale musiŭ być kataloh"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim zaviaršaje vykanańnie"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jość kataloham, ale musiŭ być fajł"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "stvarajecca kataloh %s"
@@ -3452,10 +3458,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Zaznač pakoji, jakija chočaš pakinuć"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Pakoji"
 
@@ -3567,9 +3573,9 @@ msgid ""
 msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ)."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 #, fuzzy
 msgid "default"
 msgstr "Zmoŭčany"
@@ -4222,7 +4228,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Abychod dla Jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4230,125 +4236,125 @@ msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajim budzie pieradavać fajły z akreślenym "
 "adrasam IP i proxy-serveram z opcyi file_transfer_proxies."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Mova, dla jakoj treba praviarać pravapis"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "\"all\" albo statusy, padzielenyja prabiełami"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' albo 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' albo ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Splu"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Chutka viarnusia"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Viarnusia praz paru chvilinaŭ."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Hladžu film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracuju"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Ja pracuju."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Vyjšaŭ"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Vyjšaŭ ciešycca z žyćcia."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Dastupny."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Achvotna parazmaŭlaju."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Chutka viarnusia."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Niedastupny."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Nie turbavać."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Byvaj!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4356,107 +4362,106 @@ msgstr ""
 "Hukm jaki treba hrać, kali paviedamleńnie ŭ pakoji ŭtrymlivaje adno sa "
 "słovaŭ, akreślenych u opcyi muc_highlight_words, albo tvaju mianušku."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Huk, jaki treba hrać pry atrymańni novaha hrupavoha paviedamleńnia."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "zialony"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "bakaleja"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "čałaviek"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marski"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Niapravilny host"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Źviestki rehistracyi dla transpartu %s nie pryjšli ŭ čas"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Zarehistrujsia na %s"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Niapravilny JID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Mianuška nie dazvolenaja: %s"
@@ -4464,77 +4469,77 @@ msgstr "Mianuška nie dazvolenaja: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Ty zablakavany ŭ hetym pakoji."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Takoha pakoju niama."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Stvareńnie pakojaŭ abmiežavanaje."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "padpisany na %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zapyt adpiski ad %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ciapier adpisany ad %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4674,109 +4679,138 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Niemahčyma dasyłać pustyja fajły"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Hetaje paviedamleńnie *zašyfravanaje* (Hladzi :JEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tema: %s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Pieradałučysia samastojna."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Niapravilny adkaz"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Pravier złučeńnie albo pasprabuj paźniej."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Pravier złučeńnie albo paŭtary paźniej"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Pamyłka aŭtaryzacyi z \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Kali łaska, pravier pravilnaść loginu i parolu."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Pamyłka vydaleńnia śpisu pryvatnaści"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4785,77 +4819,45 @@ msgstr ""
 "Śpis pryvatnaści %s nia vydaleny. Jon vykarystoŭvajecca adnoj z dałučanych "
 "krynic. Adklučy jaje i paŭtary znoŭ."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Niemahčyma dasyłać pustyja fajły"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Hetaje paviedamleńnie *zašyfravanaje* (Hladzi :JEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Tema: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kantakty"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Nia ściahnuta z-za niabačnaha statusu"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Naziralniki"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transparty"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
@@ -5103,7 +5105,7 @@ msgstr "Achvotna parazmaŭlaju"
 msgid "_Available"
 msgstr "_Dastupny"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Dastupny"
 
@@ -5221,48 +5223,48 @@ msgid "has closed the chat window or tab"
 msgstr "začyniŭ akno/kartku razmovy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5270,22 +5272,22 @@ msgstr[0] "Dašli paviedamleńnie"
 msgstr[1] "Dašli paviedamleńnie"
 msgstr[2] "Dašli paviedamleńnie"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5293,7 +5295,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5309,16 +5311,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "pamyłka: niemahčyma adčynić %s, kab adčytać"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "indeksavańnie bazy razmoŭ"
 
@@ -5327,705 +5329,724 @@ msgstr "indeksavańnie bazy razmoŭ"
 msgid "XMPP account %s@%s"
 msgstr "kontu %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "Prypynienaja"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Tłusty"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Brave"
 msgstr "Nie razmaŭlaju "
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Razmovy"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Tłusty"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Źmiest"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Zavieršana"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Źmiest"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Niadziejny"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 #, fuzzy
 msgid "Curious"
 msgstr "uri"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Vydal"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Disappointed"
 msgstr "Adklučana"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Dismayed"
 msgstr "Adklučana"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Distracted"
 msgstr "Adklučana"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Excited"
 msgstr "Dziejny"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Hrupa"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "paviedamleńnie"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Dziejny"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Niabačny"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "pieršaja"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Niamieckaja"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "_Madyfikuj"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Adłučany"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Hrupa"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "adzinaccataja"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "Zatrymana"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "Apošniaja źmiena:"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "Mianuška"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "Splu"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Vulica:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Aŭtaryzavany"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Čas"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "dziaviataja"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Niapravilny host"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Viečar"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "Uvod paviedamleńnia"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "Ranica"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "pavodle hrupy"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Viečar"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "Vypichvajecca %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "_Dałučysia"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Grooming"
 msgstr "pakoj"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "Jem"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Źmianiajecca tema"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "Vypichvajecca %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "Jem"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "Vypichvajecca %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "Jem"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "_Adłučajusia"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "Jem"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "Pryčyna"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Pryčyna"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "Splu"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Jem"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Hladžu film."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "Jem"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "Pieradajecca"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "Uvod paviedamleńnia"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 #, fuzzy
 msgid "On a Plane"
 msgstr "Dałučany"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 #, fuzzy
 msgid "On a Train"
 msgstr "Adčyni jak _spasyłku"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "Uvod paviedamleńnia"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "Pracuju"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -6046,36 +6067,11 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Host, akreśleny ŭ opcyi ft_override_host_to_send, niapravilny, tamu "
-"ihnarujecca."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Parol OpenPGP nia vyznačany"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Ty dałučyśsia da %s biaz OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Kab paciahnuć kamunikacyju, treba ŭruchomić Gajim nanoŭ."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Pamyłka Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6084,53 +6080,46 @@ msgstr ""
 "%s\n"
 "Lakalnyja paviedamleńni mohuć pracavać pamyłkova."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kali łaska, pravier instalacyju Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Niemahčyma ŭruchomić lakalny servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Niemahčyma dałučycca da portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Niemahčyma źmianić status kontu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr "Ty nie dałučany albo niebačny. Ty nia možaš dasyłać paviedamleńni."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6143,26 +6132,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Pamyłka dadańnia servisu. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Adklučana"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "Ukluč"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Słoŭnik dla movy %s niedastupny"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6171,215 +6160,215 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "zahałovak statusu"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "tekst paviedamleńnia statusu"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Nazva"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Pieradałučycca?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Kali chočaš zadziejničać źmieny, treba pieradałučycca."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nielha vykarystać OpenPGP na hetym kamputary"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Niepračytanyja paviedamleńni"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Pračytaj usie novyja paviedamleńni pierad vydaleńniem kontu."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Akno razmovy adčynienaje dla kontu %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Usie adčynienyja vokny razmovy buduć začynienyja. Praciahnuć?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Prahrama dałučanaja da servera"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "Kab źmianić nazvu kontu, treba pračytać usie novyja paviedamleńni."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Taki kont užo zaniaty"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Nazva kontu nia moža być pustoj."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Nazva kontu nia moža ŭtrymlivać prabiełaŭ."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kiruj kontami"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "JID musić mieć formu \"user@servername\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Abrany port musić być numeram portu."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Niemahčyma atrymać sakretnyja klučy"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Adbyłasia pamyłka ŭ časie atrymańnia sakretnych klučoŭ OpenPGP."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Vybar kluča OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Abiary svoj kluč OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Takoha kontu niama"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Treba stvaryć kont, kab redahavać asabistyja źviestki."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Nie złučyŭšysia z serveram, niemahčyma źmianiać asabistyja źviestki."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Server nie padtrymvaje Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Server nia moža zachoŭvać asabistyja źviestki."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Kont Local užo isnuje."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Kali łaska, źmiani nazvu albo vydal jaho pierad uklučeńniem miascovych "
 "paviedamleńniaŭ."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Źmiani %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Zarehistrujsia na %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Śpis zablakavanych kantaktaŭ"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Śpis udzielnikaŭ"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Śpis ułaśnikaŭ"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Śpis administrataraŭ"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Pryčyna"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Mianuška"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Funkcyja"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Blakavańnie..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6387,11 +6376,11 @@ msgstr ""
 "<b>Kaho chočaš zablakavać?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Dadajecca ŭdzielnik..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6399,11 +6388,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić udzielnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Dadajecca ŭłaśnik..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6411,11 +6400,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić ułaśnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Dadajecca administratar..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6423,7 +6412,7 @@ msgstr ""
 "<b>Kaho chočaš zrabić administrataram?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6440,58 +6429,59 @@ msgstr ""
 "4. damen (adpaviadaje damen, jak karystalnik@damen,\n"
 "damen/krynica ci paddamen)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Vydalajecca kont %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Vymahaje parolu"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Zachavaj parol"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Kali ty vydališ jaho, złučeńnie razarviecca."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Zmoŭčany"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Usie"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Tolki ŭvachod i vychad"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Niama"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Hetaja zakładka źmiaščaje niapravilnyja źviestki"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6499,31 +6489,31 @@ msgstr ""
 "zakładku."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Mianuška nie dazvolenaja: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 #, fuzzy
 msgid "Invalid server"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Kont paśpiachova dadany"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6533,34 +6523,34 @@ msgstr ""
 "Možaš źmianić dadatkovyja nałady kontu, nacisnuŭšy zaraz knopku \"Dadatkovyja"
 "\", albo paźniej, abraŭšy \"Źmianić\"->\"Konty\" ŭ menu hałoŭnaha akna."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Novy kont paśpiachova stvorany"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Treba vyznačyć imia karystalnika, kab skanfihuravać hety kont."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6570,7 +6560,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6578,72 +6568,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Nazva kontu ŭžo vykarystoŭvajecca"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Kont z takoj nazvaj užo isnuje."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Dziejny"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Padzieja"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Atrymanaje pieršaje paviedamleńnie"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Paviedamleńnie dasłanaje"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Novaje paviedamleńnie ŭ pakoji"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Novy list na skryncy GMail"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6652,229 +6642,227 @@ msgstr ""
 "Tekst pad hetaj rysaj addzialaje toj tekst, jaki ty jašče nia bačyŭ/nia "
 "bačyła"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Skonč pracu"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Dziejańni dla \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Pračytać artykuł u _Wikipedii"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Šukaj u _słoŭniku"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "U adrasie słoŭnika nie staje \"%s\", i heta nia Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "U adrasie dla web-pošuku nie staje \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Šukaj u Web"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Adčyni jak _spasyłku"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Učora"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i dzion tamu"
+msgid_plural "%i days ago"
+msgstr[0] "Učora"
+msgstr[1] "Učora"
+msgstr[2] "Učora"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Klijent kamunikacyi dla Jabber"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazva kantaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Hrupa"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "U hrupie"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "ID kluča"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Nazva kantaktu"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "Vyznač MOTD"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Paviedamleńnie statusu %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Zapišy jak šablon paviedamleńnia statusu"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Kali łaska, uviadzi nazvu dla hetaha paviedamleńnia statusu"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Adras AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Adras MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Adras Yahoo!:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Kali łaska, zapoŭni źviestki ab kantakcie, kali chočaš dadać kantakt %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Kali łaska, zapoŭni źviestki ab kantakcie, jaki chočaš dadać"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Niapravilny identyfikatar karystalnika"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Identyfikatar karystalnika nia moža ŭtrymlivać krynicy."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Hety kantakt užo jość u tvajim śpisie kantaktaŭ."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Identyfikatar karystalnika:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Jabber-klijent dla GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Versija GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Versija PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Dziejnyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Byłyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "PADZIAKI:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "I ŭrešcie, chočacca padziakavać usim apiekunam pakietaŭ."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6885,105 +6873,109 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zapyt aŭtaryzacyi dla kontu %s ad %s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zapyt aŭtaryzacyi ad %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Užo ŭdzielničaješ u razmovie ŭ pakoji %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dałučysia da pakoju dla kontu %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Treba stvaryć kont, kab razmaŭlać ź inšymi kantaktami."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Niapravilny JID pakoju"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Heta nie pakoj"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Naźvie %s nie adpaviadaje nivodny pakoj."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Pačni razmovu dla kontu %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Pačni razmovu"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6992,303 +6984,332 @@ msgstr ""
 "paviedamleńnie:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kali łaska, pravier, ci jość złučeńnie z \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Niapravilny JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Niemahčyma razabrać \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Niapravilny parol"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Treba ŭvieści parol."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Paroli roźniacca"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Novaje paviedamleńnie"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Novaje asobnaje paviedamleńnie"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Novy list"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Pieradača fajłu skončana"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kantakt źmianiŭ status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Asobnaje paviedamleńnie"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Dašli %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Atrymana %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Я %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisaŭ:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kansol XML dla %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "Kansol XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Zatrymana"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "_Madyfikuj"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Vydal"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 #, fuzzy
 msgid "Add"
 msgstr "Adras"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "_Madyfikuj"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "JID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Hrupa"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Dadaj kantakt"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Vydalaje kantakt sa śpisu"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Śpis pryvatnaści <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Śpis pryvatnaści dla %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Paradak: %s, dziejańnie: %s, typ: %s, vartaść: %s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Paradak: %s, dziejańnie: %s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redahuj praviła</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dadaj praviła</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Śpisy pryvatnaści dla %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Niapravilnaja nazva śpisu"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Treba akreślić nazvu dla novaha śpisu pryvatnaści."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Abiary hukavy fajł"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Usie fajły"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Fajły ŭ Wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Abiary vyjavu"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Vyjavy"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kali %s maje status:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Umova"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "kali maju "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7296,38 +7317,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7337,31 +7358,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Inšyja"
@@ -7371,24 +7411,24 @@ msgstr "Inšyja"
 msgid "Conference"
 msgstr "Kanferencyja"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Nia možaš prahladać najaŭnyja servisy, nie dałučyŭšysia da servera"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prahlad servisaŭ dla kontu %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Prahlad servisaŭ"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Niemahčyma znajści servis"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7396,341 +7436,336 @@ msgstr ""
 "Niama servisu z akreślenym adrasam, albo jon nie adkazvaje. Pravier adras i "
 "pasprabuj znoŭ."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Niemahčyma ahladać hety servis"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Taki servis nia ŭtrymlivaje elementaŭ dla ahladańnia."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prahlad %s dla kontu %s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Prahladaj"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Hety servis nia ŭtrymlivaje elementaŭ dla prahladu."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Vykanaj zahad..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "_Zarehistrujsia"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanavańnie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Karystalniki"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Apisańnie"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Identyfikatar"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Zakładka ŭžo dadana"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka paśpiachova dadanaja"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Možaš kiravać svajimi zakładkami praz menu \"Dziejańni\" śpisu kantaktaŭ."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Aŭtaryzavany"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 #, fuzzy
 msgid "Node"
 msgstr "Nijaki"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Novy zapis"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Aŭtaryzuj"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Zahady: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Šyfravańnie OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "_Uvachodnaje paviedamleńnie:"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "Paviedamleńnie dasłanaje"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Paroli roźniacca"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Madyfikacyja kontu"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Dastasuj da statusu"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Šyfravańnie OpenPGP"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "_Uvachodnaje paviedamleńnie:"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Ahulnaja"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "Zdolnaści serveraŭ"
@@ -7747,108 +7782,108 @@ msgstr "Čas"
 msgid "Progress"
 msgstr "Prahres"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazva fajłu: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Pamier: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Dasłaŭ: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Atrymaŭ: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Pieradača fajłu skončana"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Pieradača fajłu anulavana"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "NIemahčyma złučycca ź inšym bokam."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Atrymoŭca: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Apisańnie: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim nia moža dastupicca da hetaha fajłu"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Hety fajł vykarystoŭvajecca inšym pracesam."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Fajł: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Apisańnie: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Niemahčyma nadpisać fajł \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7856,33 +7891,33 @@ msgstr ""
 "Fajł z takoj nazvaj užo isnuje, i nie staje pravoŭ dla nadpisańnia hetaha "
 "fajłu."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Hety fajł užo isnuje"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Što chočaš zrabić?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Niemahčyma zapisać u kataloh \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie staje pravoŭ dla stvareńnia fajłaŭ u hetym katalohu."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Zapišy fajł jak..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7890,32 +7925,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Niapravilny fajł"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Fajł: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Nazva:"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Adpraŭnik:"
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Prypyni"
 
@@ -7986,11 +8021,11 @@ msgstr ""
 "ściahnuć z %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim užo vykonvajecca"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7998,434 +8033,28 @@ msgstr ""
 "Gajim užo vykonvajecca\n"
 "Usio adno ŭruchomić?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Musiš vyznačyć parol"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Vyznač parol GPG dla kontu %s."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Ty dałučyśsia da %s biaz OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Niapravilny parol"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Hetaja mianuška vykarystoŭvajecca ci zarehistravanaja na inšuju asobu.\n"
-"Kali łaska, vyznač inšuju mianušku nižej:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Prymaješ hety zapyt?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Prymaješ hety zapyt?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Aŭtaryzacyja HTTP (%s) dla %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Niemahvyma dałučycca"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "pamyłka dasyłańnia %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Zapyt aŭtaryzacyi"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Aŭtaryzacyja pryniataja"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr ""
-"Kantakt \"%s\" aŭtaryzavaŭ ciabie, i ciapier ty možaš bačyć jaho status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Anuluj aŭtaryzacyju"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Niemahčyma złučycca z \"%s\""
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s ciapier viadomy jak %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s maje ciapier status %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Treba ŭvieści parol, kab dałučycca da pakoju."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Dałučany biez kluča OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Parol niapravilny"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Parol niapravilny"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Bolš nie pytajsia"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Kiraŭnik parolaŭ GNOME instalavany, ale niapravilna vykonvajecca (mahčyma, "
-"źmiennaja asiarodździa niapravilna akreślenaja)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Novaja pošta ŭ skryncy %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "%d novy list"
-msgstr[1] "%d novyja listy"
-msgstr[2] "%d novych listoŭ"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s choča dasłać tabie fajł."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Vydalaje kantakt sa śpisu"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Pamyłka adčytańnia fajłu:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Atrymany fajł %(filename)s ad %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Fajł %(filename)s paśpiachova dasłany da %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "Dla kožnaha _paviedamleńnia"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Kanflikt imionaŭ karystalnikaŭ"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Kanflikt imionaŭ karystalnikaŭ"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Złučeńnie"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Šyfravańnie adklučanaje"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Niemahčyma dałučycca da pakoju, kali ty niabačny"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Pakazvaje daviedku pa akreślenym zahadzie"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "zahad"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "pakažy daviedku pa zahadzie"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Adčyniaje akno z nastupnym niečytanym paviedamleńniem"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8433,49 +8062,49 @@ msgstr ""
 "Pakazvaje śpis usich kantaktaŭ sa śpisu kantaktaŭ. Źviestki ab kožnym "
 "kantakcie źjaŭlajucca na novym radku"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "kont"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "pakažy kantakty akreślenaha kontu"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Pakazvaje śpis zarehistravanych kontaŭ"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "adno z: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "paviedamleńnie"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "paviedamlennie statusu"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8484,22 +8113,22 @@ msgstr ""
 "dla ŭsich kontaŭ, dla jakich vystaŭlenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Pryjary_tet:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Ja chaču za_rehistravać novy kont"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8509,23 +8138,23 @@ msgstr ""
 "dla ŭsich kontaŭ, dla jakich vystaŭlenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pakazvaje akno razmovy, kab dasyłać paviedamleńni kantaktu"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Kali akreślena, kantakt biarecca sa śpisu kantaktaŭ hetaha kontu"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8535,30 +8164,30 @@ msgstr ""
 "kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki 'kont', "
 "biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "źmiest paviedamleńnia"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "kluč pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "Kali akreślena, paviedamleńnie budzie zašyfravana hetym publičnym klučom"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "Kali akreślena, paviedamleńnie budzie dasłanaje z hetaha kontu"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8568,136 +8197,136 @@ msgstr ""
 "OpenPGP i kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki "
 "'kont', biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema paviedamleńnia"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kantaktu"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nazva kontu"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Dasyłaje kantaktu fajł"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fajł"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Ściežka da fajłu"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "Kali akreślena, fajł budzie dasłany z hetaha kontu"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Pakazvaje ŭsie nałady i ichnyja vartaści"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Akreślivaje dla 'kluča' 'vartaść'"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "kluč=vartaść"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'kluč' jość nazvaj nałady, 'vartaść' jość vartaściu hetaj nałady"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Vydalaje naładu"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "kluč"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nazva vydalenaj nałady"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisvaje dziejnyja nałady Gajima ŭ fajł .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Dadaje kantakt u śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Dadaje novy kantakt dla hetaha kontu"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Viartaje dziejny status (hlabalny, kali nie akreśleny kont)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Viartaje dziejnaje paviedamleńnie statusu (hlabalnaha, kali nie akreśleny "
 "kont)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Viartaje kolkaść niečytanych paviedamleńniaŭ"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Adčyniaje akno 'Pačni razmovu'"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Pačynaje razmovu dla hetaha kontu"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Dasyłaje svoj XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML dla dasyłańnia"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8705,77 +8334,77 @@ msgstr ""
 "Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
 "dasłany na ŭsie konty"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Absłuhoŭvaj spasyłki xmpp:/"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "źmiest paviedamleńnia"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Dałučysia da pakoju"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "pakoj"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Pakoj:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "mianuška"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "parol"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Paroli roźniacca"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Nie staje arhumenta \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8784,31 +8413,31 @@ msgstr ""
 "'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
 "Kali łaska, akreśli kont dla dasyłańnia paviedamleńnia."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Nivodny kont nia dziejny"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Arhumenty:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s nia znojdzieny"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8817,7 +8446,7 @@ msgstr ""
 "Užyvańnie: %s zahad [arhumenty]\n"
 "Zahadam moža być adzin z nastupnych vyrazaŭ:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8826,7 +8455,7 @@ msgstr ""
 "Nadta šmat arhumentaŭ. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8835,7 +8464,7 @@ msgstr ""
 "Arhument \"%s\" nie akreśleny. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Niapravilnaja spasyłka"
 
@@ -8865,174 +8494,198 @@ msgstr "Niemahčyma vydalić dziejnuju temu"
 msgid "Please first choose another for your current theme."
 msgstr "Kali łaska, zadziejničaj spačatku inšuju temu."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Pamyłka dasyłańnia pryvatnaha paviedamleńnia"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ciabie niama ŭ pakoji \"%s\", albo \"%s\" pakinuŭ jaho."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "Žurnał razmoŭ"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Złučeńnie"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s zablakavany: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s zablakavaŭ %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s ciapier viadomy jak %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Suviaź: "
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s vyjšaŭ"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s maje ciapier status %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Kali začyniš hetaje akno, adłučyśsia ad pakoju."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Bolš nie pytajsia"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Źmianiajecca tema"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Kali łaska, vyznač novuju temu:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Źmianiajecca mianuška"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Apisańnie: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Vypichvajecca %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Možaš akreślić pryčynu nižej:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Blakavańnie %s"
@@ -9058,59 +8711,451 @@ msgid "Details"
 msgstr "Padrabiaznaści"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Pamyłka: niemahčyma adčytać %s"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Pamyłka razboru fajłu:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Niemahčyma zapisać u %s. Kiravańnie sesijami nia budzie dziejničać"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie akreśleny jak zmoŭčany klijent Jabber"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chočaš zrabić Gajim zmoŭčanym klijentam Jabber?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Zaŭsiody praviaraj, ci akreśleny Gajim jak zmoŭčany klijent Jabber"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Niemahčyma zapisać vyjavu ŭ farmacie %(type)s. Zapisać jak %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Zapišy vyjavu jak..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Hetaja mianuška vykarystoŭvajecca ci zarehistravanaja na inšuju asobu.\n"
+"Kali łaska, vyznač inšuju mianušku nižej:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Prymaješ hety zapyt?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Prymaješ hety zapyt?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Aŭtaryzacyja HTTP (%s) dla %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Niemahvyma dałučycca"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "pamyłka dasyłańnia %s ( %s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Zapyt aŭtaryzacyi"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Aŭtaryzacyja pryniataja"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr ""
+"Kantakt \"%s\" aŭtaryzavaŭ ciabie, i ciapier ty možaš bačyć jaho status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Anuluj aŭtaryzacyju"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Niemahčyma złučycca z \"%s\""
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Treba ŭvieści parol, kab dałučycca da pakoju."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Dałučany biez kluča OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Parol niapravilny"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Parol niapravilny"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Kiraŭnik parolaŭ GNOME instalavany, ale niapravilna vykonvajecca (mahčyma, "
+"źmiennaja asiarodździa niapravilna akreślenaja)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Novaja pošta ŭ skryncy %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "%d novy list"
+msgstr[1] "%d novyja listy"
+msgstr[2] "%d novych listoŭ"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s choča dasłać tabie fajł."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Vydalaje kantakt sa śpisu"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Pamyłka adčytańnia fajłu:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Atrymany fajł %(filename)s ad %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Fajł %(filename)s paśpiachova dasłany da %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Dla kožnaha _paviedamleńnia"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Kanflikt imionaŭ karystalnikaŭ"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1721
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Kanflikt imionaŭ karystalnikaŭ"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s choča dasłać tabie fajł."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Zapyt na pieradaču fajłu"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Złučeńnie"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Šyfravańnie adklučanaje"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Niemahčyma dałučycca da pakoju, kali ty niabačny"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Musiš vyznačyć parol"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Vyznač parol GPG dla kontu %s."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Ty dałučyśsia da %s biaz OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Niapravilny parol"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
 
@@ -9125,7 +9170,7 @@ msgstr "Kantakty"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Data"
 
@@ -9136,7 +9181,7 @@ msgstr "Mianuška"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Paviedamleńnie"
 
@@ -9161,243 +9206,248 @@ msgstr ""
 "\n"
 "Kali ty abraŭ \"Tak\", pačakaj..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Ekspartavańnie žurnałaŭ..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s a %(time)s napisaŭ: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Sapraŭdy chočaš vydalić žurnał razmoŭ z abranym kantaktam?"
 msgstr[1] "Sapraŭdy chočaš vydalić žurnały razmoŭ z abranymi kantaktami?"
 msgstr[2] "Sapraŭdy chočaš vydalić žurnały razmoŭ z abranymi kantaktami?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Vynikaŭ hetaj aperacyi niemahčyma anulavać."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 msgstr[1] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 msgstr[2] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Žurnał razmoŭ z %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s maje ciapier status %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Dziejny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Dziejny status: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Niama złučeńnia z serveram"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Razmovy"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Pakoji"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Paviedamleńni"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s źmianiŭ status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s dałučyŭsia"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s adłučyŭsia"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Novaje asobnaje paviedamleńnie ad %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Novaje pryvatnaje paviedamleńnie ŭ pakoji %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "dziaviataja"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Atrymańnie profilu..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 #, fuzzy
 msgid "File is empty"
 msgstr "Ściežka da fajłu"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 #, fuzzy
 msgid "File does not exist"
 msgstr "Takoha pakoju niama."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Źviestki atrymanyja"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Niemahčyma apublikavać asabistyja źviestki, nie dałučyŭšysia da servera."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Dasyłańnie profilu..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Źviestki NIE apublikavanyja"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Pamyłka publikacyi vCard"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Adbyłasia pamyłka padčas publikacyi asabistych źviestak, pasprabuj paźniej."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Kali \"%s\" zadavolić tvoj zapyt, ty zmožaš bačyć jahony status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ciapier \"%s\" budzie zaŭsiody bačyć ciabie jak adłučanaha."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Ty dałučyśsia da %s biaz OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9405,28 +9455,28 @@ msgstr ""
 "Źmianiŭšy status na niabačny, ty adłučyśsia ad hetych pakojaŭ. Ty sapraŭdy "
 "chočaš stać niabačnym?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Jość niečytanyja paviedamleńni"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9435,16 +9485,16 @@ msgstr ""
 "Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
 "žurnałaŭ razmoŭ."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Musiš pračytać ich pierad vydaleńniem hetaha transpartu."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transpart \"%s\" budzie vydaleny"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9452,11 +9502,11 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transparty buduć vydalenyja"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9465,69 +9515,69 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetymi "
 "transpartami:%s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Vyznač novuju mianušku dla kantaktu %s."
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Źmiani nazvu hrupy"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chočaš vydalić hrupu %s sa śpisu kantaktaŭ?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Vydal taksama ŭsie kantakty z hetaj hrupy sa śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Pryznač kluč OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Abiary kluč dla hetaha kantaktu"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kantakt \"%s\" budzie vydaleny z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9536,12 +9586,12 @@ msgstr ""
 "jon zaŭsiody budzie bačyć ciabie adłučanym."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Što chočaš zrabić?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9549,16 +9599,16 @@ msgstr ""
 "Vydaliŭšy hety kantakt, ty zmoŭčana taksama anuluješ jahonuju aŭtaryzacyju. "
 "U vyniku jon zaŭsiody budzie bačyć ciabie adłučanym."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Ja chaču, kab hety kantakt moh bačyć moj status paśla vydaleńnia"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kantakty buduć vydalenyja z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9568,32 +9618,32 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Treba stvaryć kont, kab razmaŭlać ź inšymi kantaktami."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9602,12 +9652,12 @@ msgstr ""
 "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ. Tamu hetyja źviestki "
 "nia buduć dastupnyja pry nastupnym złučeńni."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9617,12 +9667,12 @@ msgstr ""
 "Zvyčajna hetaja mažlivaść vykarystoŭvajecca, kali adzin čałaviek "
 "karystajecca niekalkimi kontami Jabber albo niekalkimi kontami z transpartaŭ."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Niapravilny fajł"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9630,12 +9680,12 @@ msgstr[0] "%s choča dasłać tabie fajł:"
 msgstr[1] "%s choča dasłać tabie fajł:"
 msgstr[2] "%s choča dasłać tabie fajł:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Dašli %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Zrabi z %s i %s metakantakt"
@@ -9645,164 +9695,164 @@ msgstr "Zrabi z %s i %s metakantakt"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "praz kont %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "da kontu %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "praz kont %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Kiruj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "kontu %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "dla kontu %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Šukaj servisy..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "_Dašli hrupavoje paviedamleńnie"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Usim karystalnikam"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Usim dałučanym karystalnikam"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Źmiani _hrupy"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Dašli asobnaje paviedamleńnie"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Vykanaj zahad..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transparty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Pakažy _transparty"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "Źmiani _nazvu"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kantakt adłučyŭsia"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Dałučysia da pakoju"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Źmiani paviedamleńnie statusu..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9812,7 +9862,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9822,119 +9872,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "Ź_miani paviedamleńnie statusu..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "JID:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Krynica: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s hetaha pakoju"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Apošni status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " ad %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "Złučeńnie"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Aŭtaryzacyja: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Typ:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Ściahni"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Zaciahni na server"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Pierasłany: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Nie pačata"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Spyniena"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Zavieršana"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?status pieradačy:Prypyniena"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Zatrymana"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Pieradajecca"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Hety servis dahetul nie adkazaŭ na zapyt padrabiaznych źviestak"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9942,66 +9992,102 @@ msgstr ""
 "Hety servis nia zmoh adkazać na zapyt padrabiaznych źviestak.\n"
 "Servis sastareły albo złamany"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?AS:Nieviadomaja"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "ad %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikacyi</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 "Hety kantakt cikavicca tvajim statusam, ale ciabie jahony status nie cikavić"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 "Ty cikaviśsia statusam hetaha kantaktu, ale jaho nie cikavić tvoj status"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Ty i hety kantakt uzajemna cikaviciesia statusam adno adnaho"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ty i hety kantakt nie cikaviciesia statusam adno adnaho"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ty čakaješ adkazu kantaktu na zapyt aŭtaryzacyi"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Uvachodnaje paviedamleńnie:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Zychodnaje paviedamleńnie:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk+"
+
+#, fuzzy
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Host, akreśleny ŭ opcyi ft_override_host_to_send, niapravilny, tamu "
+#~ "ihnarujecca."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Parol OpenPGP nia vyznačany"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr "Kab paciahnuć kamunikacyju, treba ŭruchomić Gajim nanoŭ."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr "Ty nie dałučany albo niebačny. Ty nia možaš dasyłać paviedamleńni."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i dzion tamu"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Dadaj admysłovaje _nahadvańnie"
 
@@ -10588,9 +10674,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "A_fter nickname:"
 #~ msgstr "_Пасля мянушкі:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "П_ерад мянушкай:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Праз пэўны час:"
 
diff --git a/po/bg.po b/po/bg.po
index 50c97c6b0..6248118bb 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-19 23:43+0200\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -281,9 +281,9 @@ msgstr "Редактиране на личните данни…"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -292,9 +292,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Общи"
 
@@ -353,21 +353,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Вашите лични данни, както са запазени на сървъра"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Няма"
 
@@ -525,8 +525,8 @@ msgstr ""
 "Може да помислите и да промените настройките на огнената стена, евентуално."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -540,7 +540,7 @@ msgid "Mer_ge accounts"
 msgstr "_Смесване на акаунти"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Пре_именуване"
 
@@ -950,7 +950,7 @@ msgstr "Последно променена:"
 msgid "New entry received"
 msgstr "Получен е нов запис"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Получихте нов запис:"
 
@@ -994,11 +994,11 @@ msgstr "Въведете нова парола:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Напишете новото съобщение за състояние</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Дейност:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Настроение:"
 
@@ -1088,8 +1088,8 @@ msgstr "Редактиране на _групи…"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "По_кана в"
 
@@ -1102,8 +1102,8 @@ msgid "Remo_ve"
 msgstr "П_ремахване"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Изпращане на _специфично състояние"
 
@@ -1136,8 +1136,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Позволение за виждане на състоянието ми"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Блокиране"
 
@@ -1148,7 +1148,7 @@ msgstr "За_брана за виждане на състоянието ми"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "Ист_ория"
 
@@ -1169,8 +1169,8 @@ msgid "_Subscription"
 msgstr "_Записване"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Деблокиране"
 
@@ -1259,7 +1259,7 @@ msgstr ""
 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:820
 msgid "_Continue"
 msgstr "П_родължаване"
 
@@ -1267,7 +1267,7 @@ msgstr "П_родължаване"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомяване при завършване на файловия трансфер"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Отваряне на папката"
 
@@ -1295,7 +1295,7 @@ msgstr ""
 "Ред за контакт\n"
 "Лента за разговор"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Получер"
 
@@ -1315,11 +1315,11 @@ msgstr "Персонализиране на темите на Gajim"
 msgid "Gone"
 msgstr "Отсъства"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Бездеен"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1367,7 +1367,7 @@ msgstr "Промяна на _темата…"
 msgid "Configure _Room..."
 msgstr "Настройки на _стаята…"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Добавяне на стаята към отметките"
 
@@ -1456,8 +1456,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добре дошли в мениджъра на историята на разговорите</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -1487,7 +1488,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Търсене в базата от данни"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "История на разговорите"
 
@@ -1515,7 +1516,7 @@ msgstr "_Запазване на разговорите"
 msgid "Bookmark this room"
 msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
@@ -1542,8 +1543,8 @@ msgstr "Скоро посетени:"
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Влизане"
 
@@ -1571,7 +1572,7 @@ msgstr "Минимизиране при автоматично влизане"
 msgid "Print status:"
 msgstr "Изписване на състоянията:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Сървър:"
 
@@ -1687,17 +1688,26 @@ msgid "Show a list of formattings"
 msgstr "Списък с емотикони (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Меню с функции за напреднали (Ctrl+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Показване на профила на контакта (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Изпращане"
 
@@ -1829,6 +1839,16 @@ msgid "Configure color and font of the interface"
 msgstr "Настройване на цвят и шрифт на интерфейса"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Съобщение от разговор:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Име на контакта"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1842,31 +1862,31 @@ msgstr ""
 "Отделен списък и разговори, групирани по акаунт\n"
 "Отделен списък и разговори, групирани по вид"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Показване на _дейност на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Показване на _допълнителни данни за е-поща"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Показване на _слушаната от контактите музика в списъка"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показване на _аватари на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Показване на _настроенията на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1876,7 +1896,7 @@ msgstr ""
 "даден контакт. Тук може да укажете кои състояния бихте искали да се показват "
 "в прозорците за разговор."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1885,7 +1905,7 @@ msgstr ""
 "Gajim може да изпраща и получава мета-информация, свързана с разговора с "
 "даден контакт. Тук може да укажете кои състояния бихте искали да изпращате."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1893,11 +1913,11 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Скриване на всички бутони в прозорците за разговор."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1905,7 +1925,7 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1913,14 +1933,14 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще включва информация за подателя на новите "
 "писма."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Отсъствам“ когато "
 "компютърът не се използва."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1928,7 +1948,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
 "разположение“ когато компютърът не се използва по-дълго време."
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1936,7 +1956,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
 "и стаите"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1944,28 +1964,28 @@ msgstr ""
 "Ако тази опция е избрана, съобщенията за състояние на контактите ще се "
 "показват под имената им в списъка и в стаите"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява дейността на контактите в "
 "списъка."
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
 "списъка."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява слушаната от контактите музика "
 "в списъка."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1976,7 +1996,7 @@ msgstr ""
 "натискане с десния бутон на мишката в полето за въвеждане, ще се използва "
 "езикът по подразбиране."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1986,7 +2006,7 @@ msgstr ""
 "неупълномощени контакти. Използвайте я внимателно, тъй като блокира всички "
 "съобщения от всеки контакт, който не е в списъка."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1996,7 +2016,7 @@ msgstr ""
 "съобщение. Забележете, че при шифриране тип „E2E“ другата страна трябва да "
 "се съгласи, иначе съобщенията няма да бъдат запазвани."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2004,7 +2024,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще показва уведомление при получаването на "
 "ново писмо чрез GMail."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2014,7 +2034,7 @@ msgstr ""
 "състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
 "състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2022,7 +2042,7 @@ msgstr ""
 "Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
 "използва стандартно зададеното."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2030,50 +2050,50 @@ msgstr ""
 "Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
 "съответните анимирани или статични емотикони."
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Запазване на дневник на _шифрираната сесия"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "_Компактни прозорци за разговор"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "_Управление…"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Уведомяване за _включващи се контакти"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Уведомяване за _изключващи се контакти"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Уведомяване при нова поща от _GMail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Лични събития"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Изпълнение на з_вуци"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2083,24 +2103,24 @@ msgstr ""
 "Уведомяване\n"
 "Показване само в списъка"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "Показване на събитието в областта за _уведомяване"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Включване"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2108,27 +2128,27 @@ msgstr ""
 "Някои съобщения могат да включват „rich content“ (форматиране, цветове и т."
 "н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Подреждане на контактите по състояние"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Състояние"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "_Набор икони за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Стил"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 #, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
@@ -2139,7 +2159,7 @@ msgstr ""
 "Съобщение за автоматично състояние „Отсъствам“. Ако е празно, няма да се "
 "сменя текущото съобщение."
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 #, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
@@ -2150,103 +2170,105 @@ msgstr ""
 "Съобщение за автоматично състояние „Не съм на разположение“. Ако е празно, "
 "няма да се сменя текущото съобщение."
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Използване на и_кони за транспортите"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Използване на стан_дартните за системата"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "При получаване на ново събитие:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Грешка: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Псевдоним:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "„_Отсъствам“ след:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "Показване на уведомления при _разговор:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Емотикони:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Файлов мениджър:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Пренебрегване на излишно форматиране на входящите съобщения"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "В_ходящо съобщение:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Програма за е-поща:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "„Не съм на _разположение“ след:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Отваряне…"
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Изходящо съобщение:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "Възстановяване на стандартните _цветове"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "Изпращане на уведомления при _разговор:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "С_ъобщение за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "_Адреси:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Поведение на прозорците:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "в _стаи"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "в с_писъка"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "минути"
 
@@ -2299,7 +2321,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Ред:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Филтър за уединение"
 
@@ -2443,7 +2465,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Представка:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Роля:</b>"
 
@@ -2503,8 +2525,8 @@ msgstr "Премахване на акаунт от Gajim и от с_ървър�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Премахване"
 
@@ -2523,13 +2545,13 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_Да"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
+msgid "gtk-cancel"
 msgstr "gtk-close"
 
 #: ../data/glade/roster_window.glade.h:1
@@ -2588,7 +2610,7 @@ msgstr "_Действия"
 msgid "_Contents"
 msgstr "_Ръководства"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Редактиране"
 
@@ -2629,11 +2651,11 @@ msgid "_Add contact"
 msgstr "Добавяне на _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Информация"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Търсене"
 
@@ -2653,10 +2675,6 @@ msgstr "Регистриране към"
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_Да"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2863,283 +2881,268 @@ msgstr "Ресурс:"
 msgid "Status:"
 msgstr "Състояние:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Отмяна на потвърждението"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "На път сте да изпълните команда. Наистина ли искате да я отмените?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Услугата изпрати лошо форматирани данни"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Услугата промени идентификатора на сесията."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Услугата върна грешка."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Активирана"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Изключена"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Булев израз"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Число"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Цвят"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Име на опцията"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Стойност"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Няма)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Скрита"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Получихте нов запис:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Получихте нов запис:"
+msgstr[1] "Получихте нов запис:"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "английски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "белоруски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "български"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "бретонски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "чешки"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "немски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "гръцки"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "британски английски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "есперанто"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "испански"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "баски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "френски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "хърватски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "италиански"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "норвежки (Bokmål)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "холандски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "норвежки (Nynorsk)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "полски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "португалски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "бразилски португалски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "руски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "сръбски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "словашки"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "шведски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "китайски"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Език за проверка на правописа"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "Неопределен"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Болен"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Информация за контакта"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Наистина ли да се изпрати файла?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ако изпратите файл на %s, той/тя ще разбере истинския ви Jabber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "Шифрирането чрез GPG е включено"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Не е в списъка"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Неизвестен изпълнител"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Неизвестно заглавие"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Неизвестен източник"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> на <i>%(artist)s</i>\n"
-"от <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, 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:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3147,50 +3150,50 @@ msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщенията с GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "Шифрирането чрез GPG е изключено"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "ЩЕ СЕ запазва дневник за сесията"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "НЯМА да се запазва дневник за сесията"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "е"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "НЕ е"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "Ще"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "НЯМА да"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "и удостоверяването е успешно"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 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:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3199,23 +3202,23 @@ msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Договорката за сесията отменена"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Тази сесия е шифрирана"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr " и ЩЕ СЕ запазва дневник"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr " и НЯМА да се запазва дневник"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3223,25 +3226,25 @@ msgstr ""
 "Идентичността на отсрещния контакт не е потвърдена. Натиснете бутона със "
 "щита за повече информация."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "Шифрирането чрез E2E е изключено"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Следното съобщение НЕ БЕШЕ шифрирано"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Следното съобщение беше шифрирано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3249,15 +3252,15 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Грешка в базата от данни"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3266,7 +3269,7 @@ msgstr ""
 "Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
 "поправите или изтриете (цялата история ще бъде загубена)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s вече е %(status)s"
@@ -3275,23 +3278,23 @@ msgstr "%(name)s вече е %(status)s"
 msgid "creating logs database"
 msgstr "създаване на база от данни за разговорите"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s e файл, а би трябвало да е папка"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Спиране на програмата"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s e папка, а би трябвало да е файл"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "създаване на папка %s"
@@ -3354,10 +3357,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Изберете стаите, които искате да напуснете"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Стаи"
 
@@ -3472,9 +3475,9 @@ msgstr ""
 "свиват автоматично."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "по подразбиране"
 
@@ -4155,7 +4158,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Заобикалка заради Jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4163,15 +4166,15 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Отговор на заявки"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Изпратени заявки"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4179,111 +4182,111 @@ msgstr ""
 "Когато се договаря шифрирана сесия, да се приема ли, че искате собствените "
 "съобщения да се запазват в дневник?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Активиран ли е OpenPGP за този контакт?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr "Да се започва ли шифрирана сесия с този контакт, когато е възможно?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Език, за който желаете да се проверяват сгрешените думи."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "„all“ или състояния, разделени с интервал"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "„yes“, „no“ или „both“"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "„yes“, „no“ или „“"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, така че ми оставете съобщение."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "На линия съм."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Свободен за разговор."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Не съм на разположение."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Не ме притеснявайте."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Довиждане!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4291,99 +4294,98 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "хуманна"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Неуспех при зареждането на модула „idle“"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Грешен хост"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Невалиден локален адрес? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Регистриране в %s"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Грешка при запис"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Състоянието „Невидим“ не се поддържа."
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Акаунтът „%s“ не поддържа невидимост."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4393,7 +4395,7 @@ msgstr ""
 "поправите (вижте http://trac.gajim.org/wiki/DatabaseBackup) или изтриете "
 "(цялата история ще бъде загубена)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Псевдонимът не е позволен: %s"
@@ -4401,78 +4403,78 @@ msgstr "Псевдонимът не е позволен: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Неуспех при влизането в стаята"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вие сте отлъчени от стаята %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Стаята %s не съществува."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Създаването на стаи е ограничено."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, 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:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Стаята е била унищожена"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Вместо това може да влезете в тази стая: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
 "roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "вече сме записани за %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "искане за отписване от %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "вече сме отписани от %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4614,81 +4616,109 @@ msgstr "Основната употреба не включва подписва
 msgid "Application verification failure"
 msgstr "Грешка на приложението за проверка"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Не е възможно да бъдат изпращани празни файлове"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Нито отдалеченото присъствие е подписано, нито има зададен ключ."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "Ключът на контакта (%s) не съвпада със зададения в Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Това съобщение е *шифрирано* (вижте XEP:„27“)]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Тема: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Свържете се наново."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Сървърът „%(name)s“ отговори погрешно на запитването за регистрация: %(error)"
 "s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сървърът „%s“ предостави различна форма за регистрация"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестна грешка на SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Невалиден отговор"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспортът „%(name)s“ отговори погрешно на запитването за регистрация: %"
 "(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Неуспех при свързване с „%s“"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Неуспех при свързване с акаунт „%s“"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Връзката на акаунт „%s“ се разпадна. Опит за повторно свързване."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Автентичността на сертификата на %s може да е под въпрос."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4697,7 +4727,7 @@ msgstr ""
 "\n"
 "Грешка на SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4706,24 +4736,24 @@ msgstr ""
 "\n"
 "Неизвестна грешка на SSL: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Грешка при премахването на списъка за уединение"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4732,76 +4762,45 @@ msgstr ""
 "Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
 "свързаните ви ресурси. Изключете го и опитайте отново."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Не е възможно да бъдат изпращани празни файлове"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Нито отдалеченото присъствие е подписано, нито има зададен ключ."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Ключът на контакта (%s) не съвпада със зададения в Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Това съобщение е *шифрирано* (вижте XEP:„27“)]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Тема: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Покана на _контакти"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Транспорти"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Не е в списъка"
 
@@ -5050,7 +5049,7 @@ msgstr "Свободен за разговор"
 msgid "_Available"
 msgstr "На _линия"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "На линия"
 
@@ -5168,77 +5167,77 @@ msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d непрочетено съобщение"
 msgstr[1] "%d непрочетени съобщения"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " от стая %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " от потребител %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d чакащо събитие"
 msgstr[1] "%d чакащи събития"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5254,16 +5253,16 @@ msgid "%s is not a valid loglevel"
 msgstr "%s не е валидно ниво за дневник"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "синьозелена"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "мигриране на базата от данни с дневници към индекси"
 
@@ -5272,634 +5271,655 @@ msgstr "мигриране на базата от данни с дневници
 msgid "XMPP account %s@%s"
 msgstr "за акаунт „%s“"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Уплашен"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Изумен"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Страстен"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Ядосан"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Раздразнен"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Обезпокоен"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Възбуден"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Засрамен"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Отегчен"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Смел"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Спокоен"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Предпазлив"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Бездушен"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Уверен"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Объркан"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Замислен"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Спорещ"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Раздразнителен"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Луд"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Съзидателен"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Любопитен"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Обезсърчен"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Депресиран"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Разочарован"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Отвратен"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Уплашен"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Шашнат"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Смутен"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Завистлив"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Развълнуван"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Склонен към флиртуване"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Разочарован"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Признателен"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Опечален"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Кисел"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Виновен"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Щастлив"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "С надежда"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Сгорещен"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Скромен"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Унизен"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Гладен"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Ранен"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Впечатлен"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Със страхопочитание"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Влюбен"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Възмутен"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Заинтересуван"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Пиян"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Непобедим"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Ревнив"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Самотен"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Безпомощен"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Късметлия"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Подъл"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Унил"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Нервен"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Безразличен"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Обиден"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Оскърбен"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Игрив"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Горд"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Отпуснат"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Облекчен"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Разкайващ се"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Неспокоен"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Тъжен"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Саркастичен"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Удовлетворен"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Сериозен"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Шокиран"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Срамежлив"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Болен"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Сънен"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Спонтанен"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Стресиран"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Твърд"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Изненадан"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Благодарен"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Жаден"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Уморен"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Неопределен"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Слаб"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Обезпокоен"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Домакинствам"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Купувам хранителни продукти"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Чистя"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Готвя"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Ремонтирам"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Мия чиниите"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Пера"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Работя в градината"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Изпълнявам поръчка"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Разхождам кучето"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Пия"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Пия бира"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Пия кафе"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Пия чай"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Похапвам"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Закусвам"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Вечерям"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Обядвам"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Правя упражнения"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Карам велосипед"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Танцувам"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "На поход съм"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Тичам за здраве"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Спортувам"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Бягам"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Карам ски"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Плувам"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Тренирам"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Поддържам се"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "В Спа-центъра"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Мия си зъбите"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Подстригвам се"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Бръсна се"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Във ваната"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Взимам си душ"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "На среща"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Почивен ден"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Вися си"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Крия се"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "В отпуск"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Моля се"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Планиран отдих"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Мисля"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Почивам"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Ловя риба"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Играя"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Навън съм"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "На купон съм"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Чета"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Репетирам"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "На пазар съм"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Пуша"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Общувам"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "На плаж съм"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Гледам телевизия"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Гледам филм"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Разговарям"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "На четири очи"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Говоря по телефона"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Говоря по видеотелефона"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Пътувам"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Пътувам от/до работа"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Карам велосипед"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "В колата"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "В автобуса"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "В самолета"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "Във влака"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "На екскурзия"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Разхождам се"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Програмирам"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "На съвещание"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Уча"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Пиша"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Неизвестен изпълнител"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Неизвестно заглавие"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Неизвестен източник"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> на <i>%(artist)s</i>\n"
+"от <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5923,38 +5943,11 @@ msgstr ""
 "[Това е част от шифрирана сесия. Ако виждате това съобщение, нещо не е както "
 "трябва.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Хостът „%s“, който сте конфигурирали в опцията „ft_add_hosts_to_send“, не е "
-"валиден, така че се пренебрегва."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Не беше зададена парола за OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"За да продължите да изпращате и получавате съобщения, трябва да се свържете "
-"наново."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Грешка на Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5964,53 +5957,44 @@ msgstr ""
 "Изпращането и получаването на съобщения тип „link-local“ може и да не "
 "функционира правилно."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 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:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Неуспех при стартирането на локална услуга"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, 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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Проверете дали е стартиран avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Не сте свързани и не сте видими за другите. Съобщението ви не можа да бъде "
-"изпратено."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Това съобщение е шифрирано]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Съобщението ви не можа да бъде изпратено."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6023,24 +6007,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Грешка при добавянето на услугата. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Изключени"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Стандартно съобщение"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Няма наличен речник за %s език"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6049,220 +6033,220 @@ msgstr ""
 "За да използвате проверката за правопис, трябва да инсталирате %s речник или "
 "да изберете друг език чрез настройването на опцията „speller_language“."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Свързване наново?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Непрочетени събития"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Имате активни разговори за акаунт „%s“"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Преименуване на акаунт"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Въведете ново име за акаунт „%s“"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде във формат „user@server“."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Избор на ключ на OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия ключ на OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Сървърът ви не поддържа визитки"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Сървърът ви не може да запази личната ви информация."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Преименувайте го или го премахнете преди да активирате съобщения от/за "
 "локални контакти."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Списък с отлъчени"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Отлъчване…"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6270,11 +6254,11 @@ msgstr ""
 "<b>Кого искате да отлъчите?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Добавяне на член…"
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6282,11 +6266,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик…"
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6294,11 +6278,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор…"
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6306,7 +6290,7 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6323,86 +6307,87 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ под-домейн."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт „%s“"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "Всички"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Само влизащи и излизащи"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "Без"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Нова стая"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Псевдонимът не е позволен: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Невалиден сървър"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6412,33 +6397,33 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Задайте сървър, където искате да се регистрирате."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Сертификатът вече е във файла"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Този сертификат вече е във файла „%s“, така че няма да бъде добавен наново."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6453,7 +6438,7 @@ msgstr ""
 "Грешка на SSL: %(error)s\n"
 "Все още ли искате да се свържете с този сървър?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6464,63 +6449,63 @@ msgstr ""
 "Отпечатък тип SHA1 на сертификата:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Следващо получено съобщение в прозорец на фокус"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Следващо получено съобщение в прозорец без фокус"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Включване на контакт"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Получена поща от Gmail"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6530,7 +6515,7 @@ msgstr ""
 "получено от отсрещния контакт. Ако иконата остане\n"
 "дълго време, най-вероятно съобщението е било изгубено."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6538,224 +6523,221 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто\n"
 "за последен път сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Изход"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия за „%s“"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Липсва „%s“ в адреса на речника и не е WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в адреса за търсене"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Отваряне като _връзка"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Вчера"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "Преди %i дни"
+msgid_plural "%i days ago"
+msgstr[0] "Вчера"
+msgstr[1] "Вчера"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "В списъка вече има такъв Jabber ID"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Въведеният Jabber ID вече съществува в списъка. Изберете друг."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име на контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "В групата"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "Идентификатор на ключ"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Име на контакта"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Задаване на настроение"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Презаписване на съобщението за състояние?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Това име вече се използва. Искате ли да презапишете това съобщение за "
 "състояние?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Запазване като настроено съобщение за състояние"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Адрес на AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Номер на GG:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Номер на ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Адрес на MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Адрес на Yahoo!:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Не може да добавите себе си към списъка."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Идентификатор на потребител:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Джабър клиент за GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Версия на GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Версия на PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Текущи разработчици:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Бивши разработчици:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "И не на последно място, бихме искали да благодарим на всички, които "
 "поддържат пакетите."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@gnu.org>\n"
@@ -6764,7 +6746,7 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6777,98 +6759,102 @@ msgstr ""
 "\n"
 "Функционалността за осветяване на сгрешени думи ще е изключена"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Псевдонимът съдържа непозволени знаци."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Искане за записване за акаунт „%(account)s“ от %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Акаунт, от който искате да влезете в стаята"
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Невалиден Jabber ID на стая"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Jabber ID на стаята съдържа непозволени знаци."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Това не е стая"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не е име на стая."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Този акаунт не е свързан към сървъра"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Синхронизиране"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6877,302 +6863,331 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Невалиден JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Неуспех при анализирането на „%s“."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Ново съобщение"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Покана за разговор в стая"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Контактът промени състоянието си"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение за акаунт „%s“"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, 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:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML конзола"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Тъжен"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Унил"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "П_ремахване"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "Унил"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Добавяне на _контакт"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Премахване на контакт от списъка"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Филтър за уединение <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Филтър за уединение за %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, 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:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ред: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редактиране на правило</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавяне на правило</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Филтри за уединение за %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Невалидно име на филтър"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Поканени сте в стая."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ви покани да се присъедините към дискусия"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ви покани в стая %(room_jid)s."
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Искате ли да приемете поканата?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "когато съм "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7183,19 +7198,19 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ (SAS) на сесията е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Вече се проверили идентичността на този контакт."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Идентичността на контакта проверена"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Проверка наново…"
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7205,19 +7220,19 @@ msgstr ""
 "съобщения или да ви изпраща такива, е необходимо да проверите идентичността "
 "му като натиснете бутона по-долу."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Идентичността на контакта НЕ Е проверена"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Проверка…"
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Проверихте ли идентичността на контакта?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7232,22 +7247,22 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ на тази сесия е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Говорихте ли с отдалечение контакт за проверка на SAS?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, 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:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7256,7 +7271,7 @@ msgstr ""
 "така че съобщенията <b>не могат</b> да се шифрират. За да се доверите на "
 "този ключ, използвайте клиент на GPG."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7264,6 +7279,25 @@ msgstr ""
 "Има зададен ключ на GPG за този контакт и вие му се доверявате, така че "
 "съобщенията ще бъдат шифрирани."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Други"
@@ -7273,24 +7307,24 @@ msgstr "Други"
 msgid "Conference"
 msgstr "Стаи за разговор"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7298,295 +7332,276 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Невалидно име на сървър"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Търсене в %(address)s от акаунт „%(account)s“"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Търсене"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Изпълнение на команда"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Сканиране на %(current)d / %(total)d…"
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Идентификатор"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Отметката вече е установена"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Записан"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Възел"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Ново съобщение"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 #, fuzzy
 msgid "SSL certificat validation"
 msgstr "Грешка в сертификата на SSL"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Библиотека за проверка на валидността на сертификатите на сървърите. "
 "Използва се за установяване на сигурна връзка."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Изисква python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Разговори с автоматично открити контакти в локалната мрежа (без сървър)."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Изисква python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Команди: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипт за управление на Gajim от командния ред."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Изисква python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Избор на ключ на OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Шифриране на съобщения с ключове на GPG."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Изисква gpg и python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Автоматично засичане на състоянието на мрежата."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Изисква gnome-network-manager и python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Управление на сесии"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Запазва сесията на Gajim при излизане и я възстановява при влизане."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Изисква python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Парола за влизане в стаята"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Паролите могат да се съхраняват по сигурен начин, вместо в обикновен текст."
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Изисква gnome-keyring и python-gnome2-desktop."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Възможност за свързване към сървъри, които използват записи SRV."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Изисква dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Проверка на правописа"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Проверка на изходящите съобщения за правописни грешки."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 #, fuzzy
 msgid "Requires libgtkspell."
 msgstr "Изисква python-sexy."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Уведомления"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Изскачащи прозорци с уведомления за нови събития."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "Изисква python-notify или python-dbus заедно с notification-daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Икона в областта за уведомяване"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Икона в областта за уведомяване, отразяваща текущото състояние."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Изисква python-gnome2-extras или компилиран модул „trayicon“ от изходния код "
-"на Gajim."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Съгласуване спрямо състоянието"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Възможност за измерване на времето на бездействие, с цел да се установи "
 "автоматично съобщение за състояние."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Изисква python-gnome2."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Трансформира изрази на LaTex, разграничени с $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7594,31 +7609,31 @@ msgstr ""
 "Изисква texlive-latex-base и dvipng. Трябва да активирате опцията "
 "„use_latex“ в редактора на настройки за напреднали."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Шифриране тип „End to End“"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Шифриране на разговорите."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Изисква python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "Генератор на RST"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7626,25 +7641,38 @@ msgstr ""
 "Генериране на изход в XHTML от RST (вижте http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Изисква python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Възможност за натискане с мишката върху адреси в заглавните части на "
 "прозорците."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Изисква python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Изисква python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Функционалност"
 
@@ -7660,139 +7688,139 @@ msgstr "Време"
 msgid "Progress"
 msgstr "Напредък"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Име на файл: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Вие"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Получател: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Файловият трансфер завърши"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Файловият трансфер е прекъснат"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Не може да бъде установен контакт с отсрещната машина."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получател: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Грешка: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Избор на файл за изпращане…"
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Описание: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Неуспех при достъпа до този файл"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Този файл се използва от друг процес."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Неуспех при презаписването на съществуващия файл „%s“"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 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:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папката „%s“ не е разрешена за запис"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Нямата права да създавате файлове в тази папка."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7800,32 +7828,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Невалиден файл"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Изпращач: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Пауза"
 
@@ -7895,11 +7923,11 @@ msgstr ""
 "Уверете се, че Pywin32 е инсталиран на системата. Може да го изтеглите от %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim вече е стартиран"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7907,462 +7935,28 @@ msgstr ""
 "Изглежда вече е стартирана друга инстанция на Gajim\n"
 "Продължаване въпреки това?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Необходима е парола"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Няма зададен ключ на GPG"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Грешна парола"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Желаният от вас псевдоним за стая %s се използва или е регистриран от друг "
-"участник.\n"
-"Укажете друг псевдоним по-долу:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Приемате ли това запитване?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Приемате ли това запитване за акаунт %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Неуспех при свързването"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Грешка %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "грешка при изпращане на %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Искане за записване"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Упълномощаването е прието"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Контактът „%s“ премахна записването за вас"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Винаги ще го виждате като изключен.\n"
-"Искате ли да го премахнете от списъка с контакти?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Отписване"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Неуспех при установяването на контакт с „%s“"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s вече е познат като %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s вече е %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s зададе темата на %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "На всеки участник е позволено да вижда вашия JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Стаята показва отсъстващ член"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "Стаята не показва отсъстващи членове"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"Възникна промяна в конфигурацията на стаята (не е свързана с настройки за "
-"уединение)"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Воденето на дневник на стаята е включено"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Воденето на дневник на стаята е изключено"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Стаята не е анонимна"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Стаята е полу-анонимна"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Стаята е напълно анонимна"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
-"или е предоставил грешна парола.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "В момента сте свързани без OpenPGP ключ."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Паролата е грешна"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Паролата е грешна"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG не е използваем"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
-"съобщения."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Да _не се задава този въпрос отново"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
-"променливата на обкръжението не е настроена)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Ново писмо за %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Имате %d ново писмо"
-msgstr[1] "Имате %d нови писма"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"От: %(from_address)s\n"
-"Тема: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s иска да ви изпрати файл."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Премахване на контакт от списъка"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Грешка при четене на файл:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Успешно получихте %(filename)s от %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Успешно изпратихте %(filename)s на %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Неуспех при дешифрирането на съобщение от %s\n"
-"Възможно е да е било фалшифицирано."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Неуспех при дешифриране на съобщението"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Конфликт с имената на потребители"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Укажете ново потребителско име за локалния ви акаунт"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Пинг?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Понг! (%s сек)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Грешка."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Конфликт на ресурсите"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Грешка при проверка на сертификата на SSL"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Възникна грешка при проверката на сертификата за вашия сървър на Джабър: %"
-"(error)s\n"
-"Все още ли искате да се свържете със сървъра?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Пренебрегване на грешката за този сертификат."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Грешка в сертификата на SSL"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Изглежда сертификатът на SSL е бил променен или връзката е взломена.\n"
-"Стар отпечатък: %(old)s\n"
-"Нов отпечатък: %(new)s\n"
-"\n"
-"Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Несигурна връзка"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"На път сте да изпратите паролата си чрез нешифрирана връзка. Сигурни ли сте, "
-"че искате да го направите?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Да, наистина искам да се свържа по несигурен начин"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"На път сте да изпратите паролата си чрез несигурна връзка. Трябва да "
-"инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
-"да го направите?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "Възелът на PEP не беше премахнат"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Емотиконите са изключени"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr "Темата с емотикони не беше намерена, така че са изключени."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Темата с емотикони не можа да бъде заредена. Навярно трябва да обновите "
-"формата на файла emoticons.py. Вижте http://trac.gajim.org/wiki/Emoticons за "
-"повече подробности."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Не може да влезете в стая, докато сте невидими."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Неуспех при запазването на настройките"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Показва помощ за специфична команда"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "показване на помощ за команда"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Показва или скрива списъка"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8370,52 +7964,52 @@ msgstr ""
 "Показване на списък с всички контакти. Всеки контакт се появява на отделен "
 "ред"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "акаунт"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "показва само контактите на дадения акаунт"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Показване на списък с регистрираните акаунти"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "състояние"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "едно от: offline (изключен), online (на линия), chat (свободен за разговор), "
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
 "(невидим)"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "съобщение"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "съобщение за състояние"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8424,22 +8018,22 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Приори_тет:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "_Искам да регистрирам нов акаунт"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8449,25 +8043,25 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Показване на диалогов прозорец за разговор, за да може да се изпрати "
 "съобщение до контакта"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID на контакта, с който искате да разговаряте"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако е указано, контактът се взима от списъка с контакти на този акаунт"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8477,30 +8071,30 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "ключ на OpenPGP"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ако е указано, съобщението ще се шифрира, използвайки този публичен ключ"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8510,136 +8104,136 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тема на съобщението"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Изпраща ново съобщение до стаята, в която сте влезли."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID на стаята, която ще получи съобщението"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Получаване на подробна информация за контакта"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за акаунта"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Име на акаунта"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Път до файл"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "„ключ“ е името на настройката, „стойност“ е стойността, която се задава"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Изтрива обект от настройките"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "име на настройката за изтриване"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запазва текущото състояние на настройките във файла .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Добавяне на контакт към списъка"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Добавяне на нов контакт към този акаунт"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Връща текущото състояние (общото, в случай, че не е указан акаунт)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Връща текущото съобщение за състояние (общото, в случай, че не е указан "
 "акаунт)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Връща броя непрочетени съобщения"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отваря прозореца „Започване на разговор“"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Започване на разговор, като се използва този акаунт"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Изпраща указан XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML за изпращане"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8647,72 +8241,72 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработка на адрес тип xmpp://"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "адрес"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "Адрес за обработка"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Акаунт, за който искате да го обработите"
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Влизане в стая"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "стая"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "JID на стая"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "псевдоним"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Псевдоним"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "парола"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Парола за влизане в стаята"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Акаунт, от който искате да влезете в стаята"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Проверка дали Gajim е стартиран"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Показва или скрива прозореца на IPython"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8721,16 +8315,16 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8739,16 +8333,16 @@ msgstr ""
 "Употреба: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8757,7 +8351,7 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8766,7 +8360,7 @@ msgstr ""
 "Твърде много аргументи. \n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8775,7 +8369,7 @@ msgstr ""
 "Не е указан аргумент „%(arg)s“.\n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Грешен адрес"
 
@@ -8804,149 +8398,173 @@ msgstr "Не може да изтриете текущата тема"
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вече не сте в стая „%(room)s“ или „%(nick)s“ е напуснал(а)."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Разговор с "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Продължен разговор"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "На всеки участник е позволено да вижда вашия JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Беше създадена нова стая"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сървърът назначи или промени псевдонима ви в стаята"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, 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:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s вече е познат като %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "рангът е променен"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "Конфигурацията на стаята бе променена на „само за членове“"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "Изключване на системата"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, 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:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, 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:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s вече е %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Да _не се задава този въпрос отново"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Унищожаване на %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8954,22 +8572,22 @@ msgstr ""
 "Определено сте на път да унищожите тази стая.\n"
 "Може да укажете причина по-долу:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Може да въведете и друго място за срещи:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Отлъчване на %s"
@@ -8994,62 +8612,482 @@ msgid "Details"
 msgstr "Подробности"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Неуспех при запис на %s. Поддръжката за управление на сесиите няма да работи"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не е стандартния Джабър клиент"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Искате ли Gajim да бъде стандартния Джабър клиент?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Винаги да се проверява дали Gajim е стандартния Джабър клиент при всяко "
 "стартиране"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Разширението не се поддържа"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Изображението не може да бъде запазено във формат %(type)s. Запазване като %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Запазване на изображението като…"
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Желаният от вас псевдоним за стая %s се използва или е регистриран от друг "
+"участник.\n"
+"Укажете друг псевдоним по-долу:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Приемате ли това запитване?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Приемате ли това запитване за акаунт %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Неуспех при свързването"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Грешка %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "грешка при изпращане на %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Искане за записване"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Упълномощаването е прието"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Контактът „%s“ премахна записването за вас"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Винаги ще го виждате като изключен.\n"
+"Искате ли да го премахнете от списъка с контакти?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Отписване"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Неуспех при установяването на контакт с „%s“"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s зададе темата на %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Стаята показва отсъстващ член"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "Стаята не показва отсъстващи членове"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Възникна промяна в конфигурацията на стаята (не е свързана с настройки за "
+"уединение)"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Воденето на дневник на стаята е включено"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Воденето на дневник на стаята е изключено"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Стаята не е анонимна"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Стаята е полу-анонимна"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Стаята е напълно анонимна"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
+"или е предоставил грешна парола.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "В момента сте свързани без OpenPGP ключ."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Паролата е грешна"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Паролата е грешна"
+
+#: ../src/gui_interface.py:1170
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG не е използваем"
+
+#: ../src/gui_interface.py:1170
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
+"съобщения."
+
+#: ../src/gui_interface.py:1182
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
+"променливата на обкръжението не е настроена)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ново писмо за %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Имате %d ново писмо"
+msgstr[1] "Имате %d нови писма"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"От: %(from_address)s\n"
+"Тема: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s иска да ви изпрати файл."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Премахване на контакт от списъка"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Грешка при четене на файл:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Успешно получихте %(filename)s от %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Успешно изпратихте %(filename)s на %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Неуспех при дешифрирането на съобщение от %s\n"
+"Възможно е да е било фалшифицирано."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Неуспех при дешифриране на съобщението"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Конфликт с имената на потребители"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Укажете ново потребителско име за локалния ви акаунт"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Пинг?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Понг! (%s сек)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Грешка."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Конфликт на ресурсите"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s иска да ви изпрати файл."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Запитване за файлов трансфер"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Грешка при проверка на сертификата на SSL"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Възникна грешка при проверката на сертификата за вашия сървър на Джабър: %"
+"(error)s\n"
+"Все още ли искате да се свържете със сървъра?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Пренебрегване на грешката за този сертификат."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Грешка в сертификата на SSL"
+
+#: ../src/gui_interface.py:1906
+#, fuzzy, python-format
+msgid ""
+"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 ""
+"Изглежда сертификатът на SSL е бил променен или връзката е взломена.\n"
+"Стар отпечатък: %(old)s\n"
+"Нов отпечатък: %(new)s\n"
+"\n"
+"Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Несигурна връзка"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"На път сте да изпратите паролата си чрез нешифрирана връзка. Сигурни ли сте, "
+"че искате да го направите?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Да, наистина искам да се свържа по несигурен начин"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"На път сте да изпратите паролата си чрез несигурна връзка. Трябва да "
+"инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
+"да го направите?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "Възелът на PEP не беше премахнат"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Емотиконите са изключени"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr "Темата с емотикони не беше намерена, така че са изключени."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Темата с емотикони не можа да бъде заредена. Навярно трябва да обновите "
+"формата на файла emoticons.py. Вижте http://trac.gajim.org/wiki/Emoticons за "
+"повече подробности."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+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/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Неуспех при запазването на настройките"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Необходима е парола"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
+
+#: ../src/gui_interface.py:3477
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Няма зададен ключ на GPG"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Грешна парола"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Нова стая"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
@@ -9066,7 +9104,7 @@ msgstr "Контакти"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Дата"
 
@@ -9077,7 +9115,7 @@ msgstr "Псевдоним"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Съобщение"
 
@@ -9103,238 +9141,243 @@ msgstr ""
 "\n"
 "В случай, че изберете „Да“, изчакайте…"
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Изнасяне на записите на разговорите…"
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s каза в %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Наистина ли искате да изтриете дневниците на избрания контакт?"
 msgstr[1] "Наистина ли искате да изтриете дневниците на избраните контакти?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Това е необратима операция."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
 msgstr[1] "Наистина ли искате да изтриете избраните съобщения?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История на разговорите с %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Грешка при запис/четене от диска"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s вече е %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 #, fuzzy
 msgid "Error"
 msgstr "Грешка."
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Изтече времето за зареждане на изображението"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Изображението е твърде голямо"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Стаи"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Съобщения"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "— ще бъде воден дневник за съобщенията"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "— няма да бъде воден дневник за съобщенията"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s промени състоянието си"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s се включи"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s се изключи"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ново еднократно съобщение от %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ново лично съобщение от стая „%s“"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Съобщение от %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ново съобщение от %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "_Игнориране"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Извличане на профила…"
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Файлът не съдържа нищо"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Файлът не съществува"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Получена информация"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Изпращане на профила…"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Информацията НЕ Е публикувана"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG не е използваем"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9342,28 +9385,28 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "без синхронизация"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9371,16 +9414,16 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята и контактът е в списъка."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9388,11 +9431,11 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Ще бъдат премахнати транспорти"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9401,70 +9444,70 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "тези транспорти: %s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Преименуване на контакт"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Преименуване на група"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Въведете ново име за група „%s“"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Премахване на група"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9473,11 +9516,11 @@ msgstr ""
 "ще ви вижда изключен."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9485,16 +9528,16 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Ще бъдат премахнати контакти от списъка"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9503,7 +9546,7 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -9511,27 +9554,27 @@ msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9539,14 +9582,14 @@ msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9556,23 +9599,23 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Невалиден адрес на файл:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Искате ли да изпратите този файл на %s:"
 msgstr[1] "Искате ли да изпратите тези файлове на %s:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Изпращане на %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Изпращане на файл до контакт"
@@ -9582,157 +9625,157 @@ msgstr "Изпращане на файл до контакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Управление на отметките…"
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Публикуване на мелодия"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Настройване на услуги…"
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Максимизиране на всички"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "_Изпращане на групово съобщение"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "До всички потребители"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "До всички включени потребители"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Управление на контакти"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Изпращане на еднократно съобщение"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Изпълнение на команда…"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "Управление на _транспорт"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "Промяна на т_ранспорт"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Преименуване"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Максимизиране"
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Изключване"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Изключване"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Влизане в нова стая"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние…"
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Изчакване на резултатите"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Грешка в получените данни"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Няма резултати"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Грешка при запис на диска"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Потвърждение на тези настройки на сесията"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9747,7 +9790,7 @@ msgstr ""
 "\n"
 "\tДопустими ли са тези настройки?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9762,116 +9805,116 @@ msgstr ""
 "\n"
 "Продължаване с тази сесия?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние…"
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s на тази стая"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [минимизиран]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Състояние: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Последно състояние: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " от %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Свързан"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Изключен"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Записване: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Песен:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Завършил"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "Временно прекъснат"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9879,29 +9922,29 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е извън употреба или повредена"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "от %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9909,7 +9952,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9917,13 +9960,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9931,18 +9974,70 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Няма чакащо запитване за записване."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "В_ходящо съобщение:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Изходящо съобщение:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-close"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Хостът „%s“, който сте конфигурирали в опцията „ft_add_hosts_to_send“, не "
+#~ "е валиден, така че се пренебрегва."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Не беше зададена парола за OpenPGP"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "За да продължите да изпращате и получавате съобщения, трябва да се "
+#~ "свържете наново."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Не сте свързани и не сте видими за другите. Съобщението ви не можа да "
+#~ "бъде изпратено."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Това съобщение е шифрирано]"
+
+#~ msgid "%i days ago"
+#~ msgstr "Преди %i дни"
+
+#~ msgid "Trayicon"
+#~ msgstr "Икона в областта за уведомяване"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Икона в областта за уведомяване, отразяваща текущото състояние."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Изисква python-gnome2-extras или компилиран модул „trayicon“ от изходния "
+#~ "код на Gajim."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Добавяне на специално _уведомление"
 
diff --git a/po/br.po b/po/br.po
index bf24bab46..97e34d828 100644
--- a/po/br.po
+++ b/po/br.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -296,9 +296,9 @@ msgstr "Kemmañ an titouroù hiniennel..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -307,9 +307,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Hollek"
 
@@ -370,21 +370,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Titouroù diwar ho penn, miret war ar servijer"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Alc'hwez ebet diuzet"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Hini ebet"
 
@@ -534,8 +534,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "ID Jabber:"
 
@@ -551,7 +551,7 @@ msgid "Mer_ge accounts"
 msgstr "_Strollañ ar c'hontoù"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "_Adenvel"
 
@@ -972,7 +972,7 @@ msgstr "Anv:"
 msgid "New entry received"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
@@ -1020,12 +1020,12 @@ msgstr "Roit ur ger-kuzh nevez:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Roit un titour-stad nevez</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Oberiant"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Webgaoz:"
@@ -1122,8 +1122,8 @@ msgstr "Kemmañ ar _strolladoù"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr ""
 
@@ -1138,8 +1138,8 @@ msgid "Remo_ve"
 msgstr "_Dilemel"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Goulenn evit gwelet e/he stad"
@@ -1175,8 +1175,8 @@ msgid "_Allow him/her to see my status"
 msgstr "He/E aotren da welet ma stad"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1188,7 +1188,7 @@ msgstr "Difenn dezhañ/dezhi gwelet ma stad"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Istoradur"
 
@@ -1211,8 +1211,8 @@ msgid "_Subscription"
 msgstr "_Koumanant"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
@@ -1306,7 +1306,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Kenderc'hel"
 
@@ -1314,7 +1314,7 @@ msgstr "_Kenderc'hel"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Digeriñ ar renkell pal"
 
@@ -1343,7 +1343,7 @@ msgstr ""
 "Darempred\n"
 "Titl"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Tev"
 
@@ -1363,11 +1363,11 @@ msgstr "Personelaat gwiskadurioù Gajim"
 msgid "Gone"
 msgstr "Aet kuit"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Dizoberiant"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Stouet"
 
@@ -1419,7 +1419,7 @@ msgstr "Kemmañ ar _sujed"
 msgid "Configure _Room..."
 msgstr "Ke_fluniañ ar flap"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
@@ -1508,8 +1508,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Merour istoradur Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Dilemel"
 
@@ -1534,7 +1535,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Klask en titourva"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Istoradur ar gaoz"
 
@@ -1560,7 +1561,7 @@ msgstr "_Istoradur flapiñ"
 msgid "Bookmark this room"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
@@ -1588,8 +1589,8 @@ msgstr "Nevez 'zo:"
 msgid "Room:"
 msgstr "Webgaoz:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "E_barzhiñ"
 
@@ -1618,7 +1619,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Diskouez an eur:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Servijer:"
 
@@ -1742,17 +1743,26 @@ msgid "Show a list of formattings"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Kas"
 
@@ -1893,6 +1903,16 @@ msgid "Configure color and font of the interface"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "_Titour-stad:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Anv an darempred"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1901,34 +1921,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1939,7 +1959,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1949,7 +1969,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1957,25 +1977,25 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est déconnecté"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
@@ -1983,13 +2003,13 @@ msgstr ""
 "Si cette case est cochée, Gajim placera une icône dans la zone de "
 "notification"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1997,7 +2017,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2005,7 +2025,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2013,7 +2033,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2021,7 +2041,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2029,14 +2049,14 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2047,20 +2067,20 @@ msgstr ""
 "vous spamme/ennuie. Utilisez la avec précaution, car elle bloque tous les "
 "messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2070,13 +2090,13 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent, occupé, etc)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2084,108 +2104,108 @@ msgstr ""
 "M'eo lazhet, ne vo ket erlec'hiet ar voulomelloù ascii doare ':)' gant "
 "boulomelloù grafikel fiñv pe difiñv"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Ur prenestr-flapiñ:"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Me_rañ..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "Kemmañ ar gont"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Ma c'helaouiñ evit ar c'hemennadennoù _Gmail nevez"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "Titouroù hiniennel"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "_Seniñ"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Penndibaboù"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Lugañ"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Dilugañ"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Urzhiañ an darempredoù hervez o stad"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Stad"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "_Arlunioù-stad dre-ziouer:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Gwiskadur:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2193,7 +2213,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2201,112 +2221,114 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Implij arlunioù an _dorioù"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Fazi en ur lenn ar restr:"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "_A-raok al lesanv:"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "Bezañ lakaet da _ezvezant war-lerc'h:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Furcher web:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Boulomelloù:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "Merour _restroù:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Islinennañ ar fazioù reizhskrivañ"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Chom hep teurel pled eus ar c'hemennadennoù kaset gant tud dianav"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "Kemennadenn o _tegouezhout:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Meziant posteliñ:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Digeriñ..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Kemennadenn o _vont 'maez:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Distreiñ gant al livioù dre-ziouer"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Titour-stad:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "Ebarzhiñ ur _webgaoz"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "Ket er roll"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "munutenn"
 
@@ -2364,7 +2386,7 @@ msgstr "ID Jabber:"
 msgid "Order:"
 msgstr "Servijer:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 #, fuzzy
 msgid "Privacy List"
 msgstr "Roll argas"
@@ -2530,7 +2552,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Perzhioù</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Sonioù</b>"
@@ -2595,8 +2617,8 @@ msgstr "Dilemel ar gont diwar Gajim ha diwar ar _servijer"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Dilemel"
 
@@ -2615,14 +2637,14 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Dilemel"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_Mat eo"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr "Dilemel"
 
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
@@ -2685,7 +2707,7 @@ msgstr "_Oberoù"
 msgid "_Contents"
 msgstr "_Endalc'hadoù"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Aozañ"
 
@@ -2729,12 +2751,12 @@ msgid "_Add contact"
 msgstr "Ouzhpennañ un _darempred"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 #, fuzzy
 msgid "_Information"
 msgstr "Titouroù"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Klask"
 
@@ -2754,10 +2776,6 @@ msgstr "En em enrollañ war"
 msgid "_Cancel"
 msgstr "_Nullañ"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_Mat eo"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2981,337 +2999,324 @@ msgstr ""
 msgid "Status:"
 msgstr "Stad:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Titouroù"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Activated"
 msgstr "Oberiant"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Deactivated"
 msgstr "Dizoberiant"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 #, fuzzy
 msgid "Integer"
 msgstr "Er strollad"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Dibab"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Talvoud"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Doare"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Hini ebet)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Elfennoù kuzh"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr ""
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] ""
+msgstr[1] ""
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "German"
 msgstr "Hollek"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Greek"
 msgstr "Glas"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Croatian"
 msgstr "Chomlec'h"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Italian"
 msgstr "Stouet"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Polish"
 msgstr "_Embann"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Serbian"
 msgstr "Hollek"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "Islinennañ"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Lesanv"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "_Nodrezh:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Titouroù"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Ket er roll"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "Implij an diskleriañ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Implij an diskleriañ"
@@ -3319,58 +3324,58 @@ msgstr "Implij an diskleriañ"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "O paouez resev ur gemennadenn nevez digant \"%s\" emaoc'h"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3378,22 +3383,22 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
@@ -3402,23 +3407,23 @@ msgstr "%(nick)s a zo bremañ %(status)s"
 msgid "creating logs database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "ur restr eo %s met rankout a rafe bezañ ur renkell"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Emañ Gajim o vont da guitaat diouzhtu"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "a grou ar renkell %s"
@@ -3488,10 +3493,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 #, fuzzy
 msgid "Groupchats"
 msgstr "Flapoù a-stroll"
@@ -3605,9 +3610,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 #, fuzzy
 msgid "default"
 msgstr "Dilemel"
@@ -4181,245 +4186,244 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "O labourat"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Er-maez"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "Glas"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "Mab-den"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "Glas-mor"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 #, fuzzy
 msgid "Wrong host"
 msgstr "Ger-kuzh faos"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Gant berzh eo bet embannet ar vCard"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
@@ -4427,79 +4431,79 @@ msgstr "N'eus ket bet kavet al lesanv : %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4639,187 +4643,184 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "N'eus ket tu da gas restroù goullo"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Sifret eo ar gemennadenn-mañ]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Titl : %s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Respont direizh"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Kevreadenn"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "N'eus ket tu da gas restroù goullo"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Sifret eo ar gemennadenn-mañ]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Titl : %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Darempredoù"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Sellerien"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Dorioù"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 #, fuzzy
 msgid "Not in roster"
 msgstr "Ket er roll"
@@ -5081,7 +5082,7 @@ msgstr "Prest da flapiñ"
 msgid "_Available"
 msgstr "_Hegerz"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Hegerz"
 
@@ -5203,77 +5204,77 @@ msgid "has closed the chat window or tab"
 msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s Ko"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Kas ur gemennadenn"
 msgstr[1] "Kas ur gemennadenn"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5289,16 +5290,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "Cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "o krouiñ titourva an istoradur"
@@ -5308,698 +5309,717 @@ msgstr "o krouiñ titourva an istoradur"
 msgid "XMPP account %s@%s"
 msgstr "eus ar gont %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "Ehan"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Tev"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Flapoù"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Tev"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Endalc'hadoù"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Echu"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Endalc'hadoù"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Dizoberiant"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Dilemel"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Disappointed"
 msgstr "Dizoberiant"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Dismayed"
 msgstr "Dizoberiant"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Distracted"
 msgstr "Dizoberiant"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Strollad"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "_Ostiz:"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "kemennadenn"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Diwelus"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "Hini ebet"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "_Ostiz:"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Hollek"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "_Kemmañ"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Ezlinenn"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Strollad"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "Dilemel"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "Anv:"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "Lesanv"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "O kousket"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Straed:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Emezelañ"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Mare"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "Islinennañ"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Ger-kuzh faos"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Darvoud"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "O skrivañ"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Er strollad"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Darvoud"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "Skarzhañ %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "E_barzhiñ"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cheñch ar sujed"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "Skarzhañ %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 #, fuzzy
 msgid "Relaxing"
 msgstr "Standard"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "Skarzhañ %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "_Dilugañ"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "Abeg"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Abeg"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "O kousket"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "O treuzkas"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "O skrivañ"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "O skrivañ"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "O labourat"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, fuzzy, python-format
@@ -6019,88 +6039,57 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "N'eo ket bet roet ar ger-kuzh OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Luget e voc'h da %s hep OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Evit kenderc'hel da gas ha da resev kemennadennoù, e rankit lugañ en-dro."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, fuzzy
 msgid "Could not start local service"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Sifret eo ar gemennadenn-mañ]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6111,95 +6100,95 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Dizoberiant"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "Titour-stad"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "Enaouiñ"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Anv"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Adlugañ bremañ?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Ret eo deoc'h adlugañ evit ma vo sevenet an holl gemmoù diouzhtu."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Darvoudoù chomet dilenn"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Rankout a rit lenn an holl zarvoudoù-mañ evit gellout cheñch anv ar gont."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6207,148 +6196,148 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 #, fuzzy
 msgid "Rename Account"
 msgstr "Merañ ar c'hontoù"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber a rank bezañ er stumm \"anv@anvservijer\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Bez ez eus bet ur gudenn en ur gargañ hoc'h alc'hwezhioù-kuzh OpenPGP."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Rankout a rit bezañ luget evit kemmañ ho titouroù hiniennel."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6356,11 +6345,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6368,11 +6357,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6381,11 +6370,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6393,7 +6382,7 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6411,62 +6400,63 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6474,31 +6464,31 @@ msgstr ""
 "sined-mañ."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 #, fuzzy
 msgid "Invalid server"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Road direizh"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6509,34 +6499,34 @@ msgstr ""
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Rankout a rit reiñ un anv-arveriad-ez evit kefluniañ ar gont-mañ."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Darempred er roll dija"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6546,7 +6536,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6554,74 +6544,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Oberiant"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Darvoud"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Darempred luget"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6630,126 +6620,123 @@ msgstr ""
 "Dindan al linenn e welit ar pezh a zo bet lâret er sal-flapiñ dibaoe ar wech "
 "diwezhañ ho peus taolet ur sell ennañ."
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Kuitaat"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Mankout a ra un \"%s\" e-barzh URL ar geriaoueg, ha n'eo ket WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Mankout a ra un \"%s\" e-barzh URL ar webklask"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Dec'h"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i devezh 'zo"
+msgid_plural "%i days ago"
+msgstr[0] "Dec'h"
+msgstr[1] "Dec'h"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Flaperez Jabber"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Anv an darempred: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Strollad"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "Er strollad"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Anv an darempred"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "Lakaat MOTD"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Titour-stad %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6757,111 +6744,111 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Enrollañ evel titour-stad rakenrollet"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Chomlec'h 2:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Leuniit titouroù an darempred a zo da vezañ ouzhpennet er gont %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Leuniit an titouroù diwar-benn an darempred da ouzhpennañ"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 #, fuzzy
 msgid "User ID:"
 msgstr "ID arveriad-ez:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Ur flaperez jabber e GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "TRUGAREZ DA:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Evit echuiñ, e fell deomp trugarekaat holl gempennerien ar pakad."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6870,105 +6857,109 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Goulenn enskrivañ evit ar gont %s digant %s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ebarzhiñ ur sal-flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Anv-kont direizh"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Servijer"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6978,310 +6969,339 @@ msgstr ""
 "dezhañ:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Rankout a ra an daou c'her-kuzh bezañ heñvel en daou dakad."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Kemennadenn simpl nevez"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr ""
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Chomlec'h"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "_Kemmañ"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Dilemel"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 #, fuzzy
 msgid "Add"
 msgstr "Chomlec'h"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "_Kemmañ"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Strollad"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Ouzhpennañ un _darempred"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Dilemel an darempred diouzh ar roll"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Taolennadur: %s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 #, fuzzy
 msgid "Condition"
 msgstr "Kevreadenn"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7289,38 +7309,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7330,31 +7350,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Traoù all"
@@ -7364,24 +7403,24 @@ msgstr "Traoù all"
 msgid "Conference"
 msgstr "Kendiviz"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Rankout a rit bezañ luget evit gellout furchal er servijoù hegerz"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7389,343 +7428,338 @@ msgstr ""
 "N'eus servij ebet er chomlec'h roet, pe ne respont ket. Gwiriekait ar "
 "chomlec'h ha klaskit en-dro."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal e seurt servijoù."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "O furchal e-barzh %s oc'h implij ar gont %s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Furchal"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 #, fuzzy
 msgid "_Execute Command"
 msgstr "urzhiad"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Arveridi"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Taolennadur"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Sined lakaet dija"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar sined"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Bez e c'hellit merañ ho sinedoù dre ar meuziad Oberoù er roll-darempredoù."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 #, fuzzy
 msgid "Subscribed"
 msgstr "Emezelañ"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 #, fuzzy
 msgid "Node"
 msgstr "Hini ebet"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Urzhioù: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Encryption OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "Merour an istoradur"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "Kemennadenn gaset"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Kemmañ ar gont"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Encryption OpenPGP"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Hollek"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "Perzhioù ar servijerien"
@@ -7742,141 +7776,141 @@ msgstr "Mare"
 msgid "Progress"
 msgstr "Araokadur"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Anv ar restr: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Ment: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "C'hwi"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Kaser: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Resever:"
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Echu eo an treuzkas"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Nullet eo bet an treuzkas"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Resever:"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Dibabit ur restr da gas..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Taolennadur: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "N'hell ket Gajim tizhout ar restr-mañ"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Implijet eo ar restr-mañ gant ur poellad all."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Restr: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Doare: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 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:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Petra a fell deoc'h ober?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Enrollañ ar restr dindan..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7884,32 +7918,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Restr direizh"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Restr:"
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Anv:"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Kaser:"
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Ehan"
 
@@ -7980,444 +8014,40 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Ger-kuzh ret"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Luget e voc'h da %s hep OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Ger-kuzh faos"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré "
-"par un autre occupant.\n"
-"Veuillez entrer un autre surnom ci-dessous :"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Degemer a rit ar goulenn-mañ?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Degemer a rit ar goulenn-mañ?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Aotre HTTP (%s) evit %s (id : %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-#, fuzzy
-msgid "Connection Failed"
-msgstr "Kevreadenn"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s : %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "fazi en ur gas %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Goulenn koumanantiñ"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Aotre degmeret"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Aotreet oc'h bet gant \"%s\" da welet e stad."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Dilamet eo bet ho aotre digant \"%s\""
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Koumanantiñ"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "N'eus ket tu da dizhout \"%s\""
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s a zo bremañ %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s a zo bremañ %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Un mot de passe est requis pour rejoindre ce salon."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Direizh eo ho ker-kuzh"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Direizh eo ho ker-kuzh"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Chom hep goulenn ket"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/gajim.py:1681
-#, fuzzy, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Postel nevez war %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, fuzzy, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Bez ho peus %d postel nevez"
-msgstr[1] "Bez ho peus %d postel nevez"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "Fellout a ra da %s kas deoc'h ur restr."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Dilemel an darempred diouzh ar roll"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Fazi en ur lenn ar restr:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Gant berzh ho peus resevet %(filename)s digant %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Gant berzh ho peus kaset %(filename)s da %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "Da _bep kemennadenn:"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr ""
-
-#: ../src/gajim.py:2043
-#, fuzzy
-msgid "Please type a new username for your local account"
-msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr ""
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Kevreadenn"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Lazhet eo ar sifrañ"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-#, fuzzy
-msgid "You cannot join a group chat while you are invisible"
-msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "diskouez ar skoazell evit un urzhiad resis"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "urzhiad"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "diskouez ar skoazell evit an urzhiad"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "A zifoup ur prenestr gant ar gemennadenn dilenn da-heul"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8425,49 +8055,49 @@ msgid ""
 msgstr ""
 "A ziskouez ur roll eus an holl zarempredoù, pep darempred war ul linenn."
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "kont"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "diskouez darempredoù ar gont roet hepken"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "A ziskouez roll ar c'hontoù enrollet"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stad"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "kemennadenn"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "titour stad"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8475,21 +8105,21 @@ msgstr ""
 "A cheñch stad ar gont \"kont\". Ma n'eus hini ebet roet, klaskit cheñch stad "
 "an holl gontoù o deus an dibab \"sync with global status\" enaouet"
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "priority"
 msgstr ""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8498,25 +8128,25 @@ msgstr ""
 "A cheñch stad ar gont \"kont\". Ma n'eus hini ebet roet, klaskit cheñch stad "
 "an holl gontoù o deus an dibab \"sync with global status\" enaouet"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "A ziskouez ar prenestr flapiñ evit ma c'hellfec'h kas ur gemennadenn d'un "
 "darempred"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8527,29 +8157,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "korf ar gemennadenn"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "alc'hwezh pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "Ma vez resisaet, e vo kaset ar gemennadenn en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8560,221 +8190,221 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 #, fuzzy
 msgid "subject"
 msgstr "Titl"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 #, fuzzy
 msgid "message subject"
 msgstr "Kemennadenn gaset"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Evit kargañ titouroù-munut un darempred"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID an darempred"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Evit kargañ titouroù-munut ur gont"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Anv ar gont"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Kas ur restr d'un darempred"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "restr"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Treug ar restr"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "m'eo resisaet, e vo kaset ar rest en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Roll an holl zibaboù hag o zalvoudoù"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "A laka talvoud an 'alc'hwezh' da 'dalvoud'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "alc'hwezh=talvoud"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'alc'hwezh' eo anv an dibab, 'talvoud' eo an talvoud da lakaat dezhañ"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "A zilam un elfenn dibab"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "touchenn"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "anv an dibab da zilemel"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "A skriv stad red dibaboù Gajim er restr .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Ouzhennañ an darempred d'ar roll"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Ouzhpennañ un darempred nevez d'ar gont-mañ."
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "A ro ar stad red (an hini hollek, nemet ez eus bet resisaet ur gont bennak)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "A gas an titour-stad red (an hini hollek, nemet ez eus bet resisaet ur gont "
 "bennak)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "A ro an niver a gemennadennoù chomet dilenn"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr ""
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "korf ar gemennadenn"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Ebarzhiñ ur webgaoz nevez"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "room"
 msgstr "Digant"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Webgaoz:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "nick"
 msgstr "Lesanv"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "password"
 msgstr "Ger-kuzh:"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8783,31 +8413,31 @@ msgstr ""
 "N'emañ ket '%s' en hor roll darempredoù.\n"
 "Resisait ar gont evit kas ur gemennadenn."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "N'eo ket bet kavet %s"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8816,21 +8446,21 @@ msgstr ""
 "Implij: %s urzhiad [arguments]\n"
 "urzhiad eo unan eus :\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Ger-kuzh faos"
@@ -8861,175 +8491,199 @@ msgstr "N'hellit ket dilemel ar gwiskadur red"
 msgid "Please first choose another for your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "N'emaoc'h ket er webgaoz \"%s\" ken, pe neuze eo aet kuit \"%s\"."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "Istoradur ar gaoz"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Kevreadenn"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo argaset gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s a zo bremañ %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr ""
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s a zo bremañ %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ha sur oc'h e fell deoc'h kuitaat ar flap \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ma serrit ar prenestr-mañ, e tigevreoc'h diouzh ar flap-mañ."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Chom hep goulenn ket"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
@@ -9053,60 +8707,450 @@ msgid "Details"
 msgstr "Munudoù"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, fuzzy, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "N'eus ket bet tu skrivañ e-barzh %s."
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Voulez-vous l'écraser ?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré "
+"par un autre occupant.\n"
+"Veuillez entrer un autre surnom ci-dessous :"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Degemer a rit ar goulenn-mañ?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Degemer a rit ar goulenn-mañ?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Aotre HTTP (%s) evit %s (id : %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Kevreadenn"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s : %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "fazi en ur gas %s ( %s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Goulenn koumanantiñ"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Aotre degmeret"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Aotreet oc'h bet gant \"%s\" da welet e stad."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Dilamet eo bet ho aotre digant \"%s\""
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Koumanantiñ"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "N'eus ket tu da dizhout \"%s\""
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Un mot de passe est requis pour rejoindre ce salon."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Direizh eo ho ker-kuzh"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Direizh eo ho ker-kuzh"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:1292
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Postel nevez war %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Bez ho peus %d postel nevez"
+msgstr[1] "Bez ho peus %d postel nevez"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "Fellout a ra da %s kas deoc'h ur restr."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Dilemel an darempred diouzh ar roll"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Fazi en ur lenn ar restr:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Gant berzh ho peus resevet %(filename)s digant %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Gant berzh ho peus kaset %(filename)s da %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Da _bep kemennadenn:"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:1658
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "Fellout a ra da %s kas deoc'h ur restr."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Goulenn treuzkas"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Kevreadenn"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Lazhet eo ar sifrañ"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
+msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Ger-kuzh ret"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Luget e voc'h da %s hep OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Ger-kuzh faos"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
 
@@ -9121,7 +9165,7 @@ msgstr "Darempredoù"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Deiziad"
 
@@ -9132,7 +9176,7 @@ msgstr "Lesanv"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Kemennadenn"
 
@@ -9153,196 +9197,196 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Oc'h ezporzhiañ an istoradur..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s e lâras %(who)s: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempred-mañ?"
 msgstr[1] "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempredoù-mañ?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Setu un ober n'eus ket tu da vont war e giz."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 msgstr[1] "Ha fellout a ra deoc'h da vat diverkañ ar c'hemennadennoù diuzet?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istoradur flapiñ gant %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s a zo bremañ %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Flapoù"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Kemennadennoù"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Emañ %(nickname)s o paouez lugañ"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Emañ %(nickname)s o paouez dilugañ"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Kemennadenn simpl nevez digant %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Kemennadenn hiniennel nevez digant ar sal %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "_Kenderc'hel"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 #, fuzzy
 msgid "File is empty"
 msgstr "Treug ar restr"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 #, fuzzy
 msgid "File does not exist"
 msgstr "Ce salon n'existe pas."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 #, fuzzy
 msgid "Information received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Rankout a rit bezaén luget evit embann ho titouroù hiniennel."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "C'hwitet eo embannadur ar vCard"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9350,46 +9394,51 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Kaset eo bet an aotre"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ma asant \"%s\" ar c'houmanant e weloc'h he/e stad."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Adalek bremañ e welo ac'hanoc'h \"%s\" atav evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Luget e voc'h da %s hep OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Kemer a rit perzh e unan pe meur a webgaoz"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9397,28 +9446,28 @@ msgstr ""
 "Tremen d'ar stad diwelus a lakao ac'hanoc'h da zilugañ diouzh ar webkaozioù-"
 "se. Ha sur oc'h e fell deoc'h bezañ diwelus?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter les salons \"%s\" ?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9426,17 +9475,17 @@ msgid ""
 msgstr ""
 "Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9445,12 +9494,12 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9459,73 +9508,73 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Darempredoù"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Dilemel"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9534,12 +9583,12 @@ msgstr ""
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9547,17 +9596,17 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit dre-ziouer he/e aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Aotreañ an darempred-mañ da welout ma stad war-lerc'h e zilam"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9566,68 +9615,68 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Restr direizh"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Fellout a ra da %s kas deoc'h ur restr:"
 msgstr[1] "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Kas %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Strollañ %s ha %s"
@@ -9637,168 +9686,168 @@ msgstr "Strollañ %s ha %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "en ur implij ar gont %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "d'ar gont %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "en ur implij ar gont %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Merañ ar sinedoù..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "eus ar gont %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "evit ar gont %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Embann"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Dizoleiñ ar servijoù..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilisateurs En _Ligne"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Darempredoù"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Kemmañ ar _strolladoù"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Kas ur gemennadenn simpl"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Dorioù"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Dorioù"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Darempred diluget"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Darempred diluget"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Kemmañ an titour-stad..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Sujed: %s\n"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9808,7 +9857,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9818,120 +9867,120 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Kemmañ an titour-stad..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID Jabber:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Stad:"
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Stad diwezhañ: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "dibaoe %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "Kevreadenn"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "Darempred diluget"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Koumanant:"
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Doare:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Pellgargañ"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Kas"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Doare:"
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Treuzkaset:"
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "N'eo ket kroget"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Arsavet"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Echu"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "O treuzkas"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "N'eus ket bet kaset titouroù munut gant ar servij-mañ c'hoazh"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9939,37 +9988,37 @@ msgstr ""
 "N'eus ket bet kaset titouroù munut gant ar servij-mañ.\n"
 "Sur 'walc'h eo torr pe kamm"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "dibaoe %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 "Dedennet eo an darempred-mañ gant ho pezañs, met n'oc'h ket gant he/e hini"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9977,30 +10026,54 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Dedennet hoc'h an eil gant bezañs egile/eben"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "N'oc'h ket dedennet gant bezañs an darempred-mañ, nag eñ/hi gant ho hini"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Emaoc'h o c'hortoz respont an darempred d'ho koulenn koumanantiñ"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr ""
 
+#~ msgid "_Incoming message:"
+#~ msgstr "Kemennadenn o _tegouezhout:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "Kemennadenn o _vont 'maez:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk+"
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "N'eo ket bet roet ar ger-kuzh OpenPGP"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Evit kenderc'hel da gas ha da resev kemennadennoù, e rankit lugañ en-dro."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Sifret eo ar gemennadenn-mañ]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i devezh 'zo"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Ouzhpennañ ur gelaouenn _ispisial"
 
@@ -10245,9 +10318,6 @@ msgstr ""
 #~ msgid "Also known as iChat style"
 #~ msgstr "Anvet ivez stil iChat"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "_A-raok al lesanv:"
-
 #~ msgid "Chat"
 #~ msgstr "Flap"
 
diff --git a/po/cs.po b/po/cs.po
index b6d2479c0..44cd1ecda 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-19 23:44+0200\n"
 "Last-Translator: Petr Menšík <pihhan@cipis.net>\n"
 "Language-Team:  <>\n"
@@ -293,9 +293,9 @@ msgstr "Upravit osobní informace..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -304,9 +304,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Obecné"
 
@@ -364,21 +364,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informace o Vás, jak jsou uloženy na serveru"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Žádný"
 
@@ -533,8 +533,8 @@ msgstr ""
 "Můžeš také zvážit změnu nastavení firewallu."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -548,7 +548,7 @@ msgid "Mer_ge accounts"
 msgstr "_Spojit účty"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Přejme_novat"
 
@@ -944,7 +944,7 @@ msgstr "Naposledy upraveno:"
 msgid "New entry received"
 msgstr "Přijat nový záznam"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Dostal(a) jste novou položku: "
 
@@ -988,11 +988,11 @@ msgstr "Zadejte heslo:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Napište nový popis stavu</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Činnost:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Nálada:"
 
@@ -1083,8 +1083,8 @@ msgstr "Upravit _skupiny"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
@@ -1097,8 +1097,8 @@ msgid "Remo_ve"
 msgstr "Odst_ranit"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Poslat vlastní stav"
 
@@ -1131,8 +1131,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Dovol kontaktu vidět můj stav"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Blokovat"
 
@@ -1143,7 +1143,7 @@ msgstr "_Zakaž mu/jí vidět můj stav"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Historie"
 
@@ -1164,8 +1164,8 @@ msgid "_Subscription"
 msgstr "_Autorizace"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Odblokovat"
 
@@ -1253,7 +1253,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Pokračovat"
 
@@ -1261,7 +1261,7 @@ msgstr "_Pokračovat"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozornit mě po dokončení přenosu souboru"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Otevřít obsahující složku"
 
@@ -1290,7 +1290,7 @@ msgstr ""
 "Řádek kontaktu\n"
 "Nadpis rozhovoru"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Tučné"
 
@@ -1310,11 +1310,11 @@ msgstr "Úprava témat Gajimu"
 msgid "Gone"
 msgstr "Pryč"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Latinka"
 
@@ -1363,7 +1363,7 @@ msgstr "Změnit _předmět"
 msgid "Configure _Room..."
 msgstr "Nastavit _místnost"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Záložky"
 
@@ -1451,8 +1451,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Vítejte do Gajimova Správce Historie</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1482,7 +1483,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Hledat v databázi"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Historie konverzace"
 
@@ -1510,7 +1511,7 @@ msgstr "_Zaznamenat historii konverzace"
 msgid "Bookmark this room"
 msgstr "Přidat tuto místnost do záložek"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
@@ -1537,8 +1538,8 @@ msgstr "Nedávno:"
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Vstoupit"
 
@@ -1566,7 +1567,7 @@ msgstr "Minimalizovat po připojení"
 msgid "Print status:"
 msgstr "Vypiš stav:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1677,17 +1678,26 @@ msgid "Show a list of formattings"
 msgstr "Zobrazit seznam formátování"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Zobrazit nabídku rozšířených funkcí (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Zobrazit profil kontaktu (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "Ode_slat"
 
@@ -1803,7 +1813,7 @@ msgstr ""
 "Automaticky zjistit při každém startu aplikace\n"
 "Vždy použít výchozí aplikace z GNOME\n"
 "Vždy použít výchozí aplikace z KDE\n"
-"Vždy použít výchozí aplikace z XFCE4\n"
+"Vždy použít výchozí aplikace z Xfce\n"
 "Vlastní"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1819,6 +1829,16 @@ msgid "Configure color and font of the interface"
 msgstr "Nastav barvu a písmo uživatelského rozhraní"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Zpráva diskuze:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Jméno kontaktu"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1832,31 +1852,31 @@ msgstr ""
 "Samostatný roster a samostatná okna pro diskuze pro každý účet\n"
 "Samostatný roster s diskuzními okny podle typu"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Zobrazovat čin_nosti kontaktů v seznamu"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Zobraz _podrobnosti emailu"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Zobrazovat _hudbu kontaktů v seznamu"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zobrazovat a_vatary kontaktů v seznamu"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Zobrazovat _nálady kontaktů v seznamu"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1866,7 +1886,7 @@ msgstr ""
 "vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru "
 "chcete zobrazovat v oknech rozhovoru."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1876,7 +1896,7 @@ msgstr ""
 "vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru "
 "chcete posílat svému protějšku."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1884,17 +1904,17 @@ msgstr ""
 "Gajim Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém "
 "dolním rohu obrazovky"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1902,13 +1922,13 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového "
 "emailu"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Pokud je zaškrtnuto, Gajim změnít stav na 'Pryč' pokud je počítač nepoužíván."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1916,7 +1936,7 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim změní stav na 'Nedostupný' pokud se počítač "
 "nepoužívá delší dobu"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1924,7 +1944,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1932,28 +1952,28 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v "
 "okně Seznamu a v diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1963,7 +1983,7 @@ msgstr ""
 "nastavení jazyk přes pravé tlačítko na vstupním poli, tak se použije výchozí "
 "jazyk pro tento kontakt nebo diskuzi."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1973,7 +1993,7 @@ msgstr ""
 "rozvahou, protože tato volba zakáže všechny zprávy od kontaktů, které ještě "
 "nemáte v rosteru"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1983,7 +2003,7 @@ msgstr ""
 "použití E2E musí protějšek souhlasit se záznamem, jinak zprávy nebudou "
 "zaznamenávány."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1991,7 +2011,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového "
 "emailu"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2001,7 +2021,7 @@ msgstr ""
 "z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, "
 "atd...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2009,7 +2029,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim se nebude pokáždé ptát na zprávu stavu. Místo toho "
 "použije výchozí nadefinovanou zprávu."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2017,19 +2037,19 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
 "animované nebo statické grafické smajlíky"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Logovat šifrované rozhovory"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Udělej o_kna zpráv kompaktní"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Sp_ravovat..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
@@ -2039,32 +2059,32 @@ msgstr ""
 "Pouze při čekajících událostech\n"
 "Vždy"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Upozorni mě na kontakty které se přihlásí"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Upozorni mě na kontakty které se odhlásí"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Upozorni při novém _GMail emailu"
 
 # FIXME: snad je to ok?
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Moje události"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2074,23 +2094,23 @@ msgstr ""
 "Upozorni mě\n"
 "Zobrazit pouze v rosteru"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
 msgstr "Zobraz oznamovací oblast:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2098,27 +2118,27 @@ msgstr ""
 "Některé zprávy mohou obsahovat formátování (odsazení, barvy aj.). Pokud je "
 "zaškrtnuto, Gajim zobrazí pouze čistý text."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Seřadit podle stavu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Výchozí _ikony stavů:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2130,7 +2150,7 @@ msgstr ""
 "$S se nahradí za předchozí popis stavu\n"
 "$T se nahradí dobou nečinnosti před zapnutím stavu Pryč"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2142,103 +2162,105 @@ msgstr ""
 "$S se nahradí za předchozí popis stavu\n"
 "$T se nahradí dobou nečinnosti před zapnutím stavu Nedostupný"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Používat ikony _transportů"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Použij nastavení _systému"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Když je přijata nová zpráva"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Chybová zpráva: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Přezdívka:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "_Automaticky pryč po:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "Zobrazovat _události stavu rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Smajlíky:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Správce souborů:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoruj formátování v příchozích zprávách"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Příchozí zpráva:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "E-_mailový klient:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "Automaticky _nedostupný po:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Otevřít..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Odchozí zpráva:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Vrátit k výchozím barvám"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "Zobrazovat _události stavu rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Stav:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "Zvýraznění _URL:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "Chování _okna"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "v _diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "v _rosteru"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutách"
 
@@ -2291,7 +2313,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Pořadí:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Nastavení Soukromí"
 
@@ -2435,7 +2457,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Před jménem</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Postavení:</b>"
 
@@ -2495,8 +2517,8 @@ msgstr "Odstranit účet z Gajimu i ze _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "Odst_ranit"
 
@@ -2515,13 +2537,13 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
+msgid "gtk-cancel"
 msgstr "gtk-close"
 
 #: ../data/glade/roster_window.glade.h:1
@@ -2579,7 +2601,7 @@ msgstr "_Akce"
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Úpravy"
 
@@ -2620,11 +2642,11 @@ msgid "_Add contact"
 msgstr "Přidat _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "Informace o kontaktu"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Najít"
 
@@ -2644,10 +2666,6 @@ msgstr "Zaregistrovat"
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2852,280 +2870,266 @@ msgstr "Zdroj:"
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Zrušit ověření"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Právě se provadí příkaz. Chcete ho skutečně přerušit?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Služba odeslala chybné data"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Služba změnila identifikátor sezení."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktivní"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Neaktivní"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Číslo"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Barva"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Název volby"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Žádný)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Skryté"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Dostal(a) jste novou položku: "
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Dostal(a) jste novou položku: "
+msgstr[1] "Dostal(a) jste novou položku: "
+msgstr[2] "Dostal(a) jste novou položku: "
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Angličtina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Běloruština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulharština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretonština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Němčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Řečtina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Britština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Španělština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Baskičtina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Francouzština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Chorvatština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norština (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugalština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brazilská portugalština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Srbština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovenština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Švédština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Čínština"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Kontrola jazyka"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 msgid "Underline"
 msgstr "Podtrhnout"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 msgid "Strike"
 msgstr "Přeškrtnout"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 msgid "Clear formating"
 msgstr "Smazat formátování"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Opravdu odeslat soubor?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Pokud odešlete soubor %s, tak bude znát vaše skutečné Jabber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG Šifrování zapnuto"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Není v Rosteru"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Seznam aktivních, dokončených a zastavených přenosů souborů"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Neznámý Umělec"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Neznámý Název"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Neznámý Zdroj"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
-"z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskuze %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Nepřiřazen GPG klíč"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3133,50 +3137,50 @@ msgstr ""
 "Tento kontakt nemá přiřazen GPG klíč. Proto nemůžeš šifrovat pomocí GPG "
 "zprávy."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG Šifrování vypnuto"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Sezení BUDE logováno"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Sezení NEBUDE logováno"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "NENÍ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "NEBUDE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "a autentizovaný"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
 msgstr "a NEautentizovaný"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3185,62 +3189,62 @@ msgstr ""
 "Šifrování %(type)s %(status)s aktivní %(authenticated)s.\n"
 "Váš rozhovor %(logged)s zaznamenáván."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Sezení bylo zrušeno"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Toto sezení je šifrované"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr "a BUDE zaznamenáváno"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr "a NEBUDE zaznamenáváno"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "Kontakt nebyl ověřen. Klikněte na tlačítko štítu pro více informací."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E Šifrování vypnuto"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Následující zpráva NEBYLA šifrovaná"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Následující zpráva byla šifrovaná"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Právě jsi obdržela novou zprávu od \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Pokud zavřete toto okno a historie je vypnutá, tato zpráva bude ztracena."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3249,7 +3253,7 @@ msgstr ""
 "Nelze přečíst soubor databáze (%s). Opravte ho nebo smažte (tím ztratíte "
 "všechny zprávy v historii)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je nyní %(status)s"
@@ -3258,23 +3262,23 @@ msgstr "%(name)s je nyní %(status)s"
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je soubor, ale měl by být adresář"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je adresář, ale měl by to být soubor"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
@@ -3337,10 +3341,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Vyber diskuze, které chceš opustit"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Diskuze"
 
@@ -3452,9 +3456,9 @@ msgstr ""
 "Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "výchozí"
 
@@ -4113,7 +4117,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4121,15 +4125,15 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve "
 "volbě pro přenos souborů file_transfer_proxies."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Odpověď na doručení žádosti"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Poslat žádost"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4137,112 +4141,112 @@ msgstr ""
 "Pokud sestavuji šifrované sezení, má Gajim přepokládat povolení "
 "zaznamenávání zpráv?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je OpenPGP povoleno pro tento kontakt?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 "Má Gajim uskutečnit šifrované spojení s tímto kontaktem je-li k dispozici?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "všechny nebo mezerou oddělené stavy"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', nebo 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' nebo ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4250,97 +4254,96 @@ msgstr ""
 "Zvuk, který bude přehrán, pokud zpráva diskuze obsahuje jedno ze slov v "
 "muc_highlight_words, nebo když obsahuje Vaši přezdívku."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Přehraný zvuk při příchodu jakékoliv MUC zprávy."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nelze nahrát idle modul"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Nesprávné jméno počítače"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Neplatná místní adresa? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrační informace pro transport %s nedorazily včas"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
 msgstr "Registrace úspěšná"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, fuzzy, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrace úspěšná"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
 msgstr "Registrace selhala"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Chyba zápisu na disk (možná je plný?)"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Neviditelnost není podporována"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditelnost."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Přišla zpráva od neplatného JID a byla ignorována."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4349,7 +4352,7 @@ msgstr ""
 "Nelze přečíst soubor databáze (%s). Opravte ho (viz http://trac.gajim.org/"
 "wiki/DatabaseBackup) nebo smažte (tím ztratítu všechny zprávy v historii)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Přezdívka nepovolena: %s"
@@ -4357,76 +4360,76 @@ msgstr "Přezdívka nepovolena: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Máš zakázán přístup do diskuze %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskuze %s neexistuje."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Vytváření místností není povoleno."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Musí být použita přezdívka, jež máte zaregistrovánu v diskuzi %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nejsi v seznamu členů diskuze %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Místnost byla zničena"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Můžete se připojit do této místnosti: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "jsme nyní zapsáni k %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Žádost o zrušení autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "byla nám zrušena autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4563,77 +4566,106 @@ msgstr "Použítý klíč neobsahuje podpis certifikátu"
 msgid "Application verification failure"
 msgstr "Ověřování aplikace skončilo neúspěchem"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Není možné poslat zprávu kontaktu %s, takové JID není platné."
+
+# FIXME: co to je?
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Není podepsaná přítomnost ani není přiřazen klíč."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "Klíč kontaktu (%s) se neshoduje s klíčem v Gajimu."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Tato zpráva je *zašifrovaná* (Viz :XEP:\"27\")]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Předmět: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Znovu připojit ručně."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %s odpověděl chybně na požadavek regisrace: %s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytnul rozdílný registrační formulář"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznámá SSL chyba: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s odpověděl chybně na požadavek registrace: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Uloženo do: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Spojení s proxy selhalo"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Selhalo připojení k účti %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Spojení s účtem %s bylo ztraceno. Opět se připojte."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4642,7 +4674,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4651,24 +4683,24 @@ msgstr ""
 "\n"
 "Neznámá SSL chyba: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Chyba při odebírání privacy listu"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4677,77 +4709,45 @@ msgstr ""
 "Privacy list %s nebyl odstraněn. Možná je aktivní v jednom z připojených "
 "zdrojů. Zruště jeho používání a zkuste znovu."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Není možné poslat zprávu kontaktu %s, takové JID není platné."
-
-# FIXME: co to je?
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Není podepsaná přítomnost ani není přiřazen klíč."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Klíč kontaktu (%s) se neshoduje s klíčem v Gajimu."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Tato zpráva je *zašifrovaná* (Viz :XEP:\"27\")]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Předmět: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Pozvat kontakt"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Registrace selhala"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Přihlížející"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Není v rosteru"
 
@@ -4993,7 +4993,7 @@ msgstr "Ukecaný"
 msgid "_Available"
 msgstr "Přip_ojen"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Připojen"
 
@@ -5111,48 +5111,48 @@ msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5160,22 +5160,22 @@ msgstr[0] "Čeká %d zpráva"
 msgstr[1] "Čekají %d zprávy"
 msgstr[2] "Čeká %d zpráv"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr "z místností %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr "od uživatele %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5183,7 +5183,7 @@ msgstr[0] "Čeká %d událost"
 msgstr[1] "Čekají %d události"
 msgstr[2] "Čeká %d událostí"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5199,16 +5199,16 @@ msgid "%s is not a valid loglevel"
 msgstr "%s není platný loglevel"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "azurová"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "převádím záznamy historie k použítí indexů"
 
@@ -5217,667 +5217,688 @@ msgstr "převádím záznamy historie k použítí indexů"
 msgid "XMPP account %s@%s"
 msgstr "XMPP účet %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Vylekaný"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Užaslý"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Milující"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Rozzlobený"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Mrzutý"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 #, fuzzy
 msgid "Anxious"
 msgstr "Znepokojený"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Vzrušený"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Zahanbený"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Znuděný"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Statečný"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Klidný"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Opatrný"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Chladný"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Sebevědomý"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Zmatený"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Zamyšlený"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Spokojený"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Potrhlý"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Šílený"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Tvořivý"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Zvědavý"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Odmítnutý"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Deprimovaný"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Zklamaný"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Znechucený"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Zděšený"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Roztržitý"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 #, fuzzy
 msgid "Embarrassed"
 msgstr "Rozpačitý"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Závidějící"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Nadšený"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Záletný"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 #, fuzzy
 msgid "Frustrated"
 msgstr "Rozčarovaný"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Vděčný"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Truchlící"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Nevrlý"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Provinilý"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Šťastný"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Doufající"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Rozpálený"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Pokorný"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 #, fuzzy
 msgid "Humiliated"
 msgstr "Ponížený"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Hladový"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Raněný"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "Ohromený"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "S respektem"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Zamilovaný"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Rozhořčený"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Zaujatý"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Opilý/Zfetovaný"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Nepřekonatelný"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Žárlivý"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Osamělý"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Ztracený"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Šťastný"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Nízký"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Náladový"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervózní"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Bez emocí"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Uražený"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Rozčílený"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Hravý"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Hrdý"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 #, fuzzy
 msgid "Relaxed"
 msgstr "Uvolněný"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "Uvolněný"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Kajícný"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 #, fuzzy
 msgid "Restless"
 msgstr "Netrpělivý"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Smutný"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Jízlivý"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Spokojený"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Vážný"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Šokovaný"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Plachý"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Nemocný"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Ospalý"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontánní"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Stresovaný"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Silný"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Překvapený"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Děkovný"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Žíznivý"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Unavený"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Nedefinováno"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Slabý"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Worried"
 msgstr "Ustaraný"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Domácí práce"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Nakupuji potraviny"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Uklízím"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Vařím"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 #, fuzzy
 msgid "Doing Maintenance"
 msgstr "Dělám údržbu"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Umývám nádobí"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Peru"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Zahradničím"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 #, fuzzy
 msgid "Running an Errand"
 msgstr "Vyřizuji"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Venčím psa"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "Piju"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Piju pivo"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Having Coffee"
 msgstr "Na kávě"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Dávám si čaj"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 #, fuzzy
 msgid "Having a Snack"
 msgstr "Svačím"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 #, fuzzy
 msgid "Having Breakfast"
 msgstr "Snídám"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 #, fuzzy
 msgid "Having Dinner"
 msgstr "Večeřím"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 #, fuzzy
 msgid "Having Lunch"
 msgstr "Obědvám"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Jedu na kole"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Tančím"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Na výšlapu"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "Jogging"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Sportuji"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Běhám"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Lyžuji"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Plavu"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Posiluji"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Grooming"
 msgstr "Pečuji o sebe"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 #, fuzzy
 msgid "At the Spa"
 msgstr "V lázních"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Brushing Teeth"
 msgstr "Čistím si zuby"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 #, fuzzy
 msgid "Getting a Haircut"
 msgstr "U holiče"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Holím se"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Koupu se"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Sprchuji se"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Mám schůzku"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Den volna"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Venku za zábavou"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Skrývám se"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "Na dovolené"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Modlím se"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Plánovaná dovolená"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Přemýšlím"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 #, fuzzy
 msgid "Relaxing"
 msgstr "Relaxuji"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Rybařím"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "Hraji hry"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "Venku"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Na párty"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Čtu si"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Nacvičuji"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Nakupuji"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Kouřím"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Ve společnosti"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Opaluji se"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Sleduji TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Dívám se na film"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "Povídám si"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "Ve skutečném světě"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Telefonuji"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Mám videohovor"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Cestuji"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "Dojíždím"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Řídím"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "V autě"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "V autobuse"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "V letadle"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "Ve vlaku"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "Na výletě"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Na procházce"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Programuji"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "In a Meeting"
 msgstr "Na setkání"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Učím se"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Píši"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Neznámý Umělec"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Neznámý Název"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Neznámý Zdroj"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
+"z <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5899,37 +5920,11 @@ msgstr ""
 "[Tato zpráva je součástí šifrovaného sezení. Pokud vidíte tuto zprávu, tak "
 "je něco špatně.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Host %s nastevený jako ft_add_hosts_to_send má rozšířenou volbu chybnou, "
-"bude ignorována."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP heslo nebylo zadáno"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Budete připojen(a) k %s bez OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Pro pokračování v přijímání a odesílání zpráv se musíte znovu připojit."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5938,52 +5933,44 @@ msgstr ""
 "%s\n"
 "Zasílání lokálních zpráv nemusí fungovat správně."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Zkontrolujte zda je Avahi nebo Bonjour nainstalováno."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Nepodařilo se spustit lokální službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemůžu naslouchat na portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Zkontrolujte, zda avahi-daemon běží."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nemůžu změnit stav účtu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Nejsi připojen nebo viditelný pro ostatní. Tvoje zpráva nemůže být odeslána."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Tato zpráva je zašifrovaná]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Vaše zpráva nemohla být odeslána."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je offline. Vaše zpráva nemohla být odeslána."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Spojení k počítači nebylo navázáno:Vypršel čas při odesílání dat."
@@ -5994,24 +5981,24 @@ msgstr "Spojení k počítači nebylo navázáno:Vypršel čas při odesílání
 msgid "Error while adding service. %s"
 msgstr "Chyba při přidávání služby. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Výchozí Zpráva"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Povolit"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6020,212 +6007,212 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "text stavu"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Pokud chcete, aby se změny projevily ihned, musíte se znovu přihlásit."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP na tomto počítači není použitelné"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otevřel(a) jsi rozhovor z účtu %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "Před změnou jména účtu si musíte přečíst všechny čekající zprávy."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Toto jméno je už použito pro jiný účet. Zvolte jiné, prosím."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Přejmenovat účet"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadej nové jméno pro účet %s."
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí být ve tvaru \"uživatel@jménoserveru\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Nastala chyba při získávání Vašich OpenPGP privátních klíčů."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Musíte vytvořit účet před úpravou vašich osobních údajů."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Váš server nepodporuje vizitky."
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumí uložit Vaše osobní informace."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Prosím přejmenujte nebo odstraňte před povolením lokálních zpráv."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6233,37 +6220,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát členem?</b>\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát vlastníkem?</b>\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát správcem?</b>\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6281,58 +6268,59 @@ msgstr ""
 "uživatel@doména),\n"
 "doména/zdroj, nebo adresa obsahující poddoménu."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Všechny"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Pouze při vstupu a výstupu"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Žádný"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Nová diskuze"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6340,29 +6328,29 @@ msgstr ""
 "záložku."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Přezdívka nepovolena: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6372,32 +6360,32 @@ msgstr ""
 "Můžete nastavit rozšířené volby účtu po stisknutí tlačítka Rozšířené, nebo "
 "později stisknutím v položce menu Účty v nabídce Úpravy hlavního okna."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Musíte zadat uživatelské jméno před nastavením tohoto účtu."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Prosím zadejte server u kterého se chcete zaregistrovat."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Certifikát je již v souboru"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Tento certifikát je již v souboru %s, takže nebude znova přidán."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, fuzzy, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6412,7 +6400,7 @@ msgstr ""
 "SSL Chyba: %s\n"
 "Přesto se chcete připojit na tento server?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6423,63 +6411,63 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Další zpráva přijata zvýrazněná"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Další zpráva přijata nezvýrazněná"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Přišel GMail Email"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6489,7 +6477,7 @@ msgstr ""
 "stranou. Pokud zůstává dlouho, zpráva je pravděpodobně\n"
 "ztracena."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6498,227 +6486,225 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
 "diskuze"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Konec"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chybí \"%s\" a není to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Včera"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "před %i dny"
+msgid_plural "%i days ago"
+msgstr[0] "Včera"
+msgstr[1] "Včera"
+msgstr[2] "Včera"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je již na seznamu"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber ID je již na seznamu. Vyberte jiné."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "Ve skupině"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "ID klíče"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Nastavit Náladu"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Přepsat Text stavu?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Toto jméno je již použito. Chcete přepsat text stavu?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Uložit jako přednastavený stav"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Napište jméno pro tento stav"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG číslo: "
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ číslo: "
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje kontaktu, který chcete přidat do účtu %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ verze: "
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK verze: "
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Aktivní vývojáři:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Poslední, nikoliv nejmenší, poděkování patří všem správcům instalačních "
 "balíčků."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Petr Menšík <pihhan@seznam.cz>\n"
 "scippio <scippio@berounet.cz>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6729,98 +6715,102 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Žádost o autorizaci na účtu %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Účet z kterého chcete vstoupit do místnosti"
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Tohle není diskuze"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s není jméno diskuze."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Tento účet není připojen k serveru"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6828,300 +6818,329 @@ msgstr ""
 "Vyplňte Jabber ID nebo přezdívku kontaktu, se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím ujistěte se že jste připojen s účtem \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Neplatné JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nemůžu dekódovat \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, 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:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Smutný"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Náladový"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "Odst_ranit"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Chtěl(a) bych si Vás přidat do mého Seznamu."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 #, fuzzy
 msgid "Add"
 msgstr "Adresa"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "Náladový"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Skupina"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Přidat _kontakt"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Odstraní kontakt ze Seznamu"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Soukromý seznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Pořadí: %s, akce: %s, typ: %s, hodnota: %s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upravit pravidlo</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Přidat pravidlo</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Neplatné jméno seznamu"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte zadat jméno pro vytvoření privacy listu."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Jste pozván do diskuze"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete přijmout pozvání?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "č."
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Podmínka"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "když jsem "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, fuzzy, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7132,19 +7151,19 @@ msgstr ""
 "\n"
 "Krátký Autentizační řetězec pro toto sezení je: %(sas)s"
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Už jste prověřoval identitu tohoto kontaktu."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu ověřena"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Ověřit znovu"
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7154,19 +7173,19 @@ msgstr ""
 "zprávy nebo vám poslat zprávu, je potřeba ověřit jejich identitu kliknutí na "
 "tlačítko dole."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NENÍ ověřena"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Ověřit..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Ověřil(a) jste identitu kontaktu?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, fuzzy, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7180,21 +7199,21 @@ msgstr ""
 "Autentizační řetězec (SAS) jako vy.\n"
 "Krátký Autentizační řetězec: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Mluvily jste se vzdáleným kontaktem a ověřil s ním SAS?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Klíč kontaktu (%s) <b>se neshoduje</b> s klíčem přiřazeným v Gajimu."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Tomuto kontaktu není přiřazen GPG klíč. Proto nemůžete šifrovat zprávy."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7203,7 +7222,7 @@ msgstr ""
 "proto zpráva <b>nemůže</b> být zašifrovaná. Použijte Váš GPG klient pro "
 "nastavení důvěry."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7211,6 +7230,25 @@ msgstr ""
 "Tento kontakt má přiřazen GPG klíč a tomuto klíči důvěřujete, zprávy tedy "
 "budou šifrované."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Ostatní"
@@ -7220,24 +7258,24 @@ msgstr "Ostatní"
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7245,284 +7283,265 @@ msgstr ""
 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
 "opakujte znovu."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žádné položky, které je možné prohlížet."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Neplatné jméno serveru"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Procházím %(address)s pomocí účtu %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Tato služba neobsahuje žádné položky, které je možno prohlížet."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "Spustit _příkaz..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skenuji %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "č."
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Diskuze \"%s\" už je ve Vašich záložkách."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Autorizován"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Uzel"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Nový záznam"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr "Validace SSL certifikátu"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Knihovna se používá k ověření certifikátu serveru pro zabezpečené spojení."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Je potřeba python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverless automaticky komunikuje s klienty detekovanými v místní síti."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Je potřeba python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Je potřeba pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 msgid "Command line"
 msgstr "Příkazový řádek"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 #, fuzzy
 msgid "A script to control Gajim via commandline."
 msgstr "Skript, který ovládá Gajim s příkazové řádky."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Je potřeba python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Vlastnost není k dispozici pod Windows."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
 msgstr "Šifrování zpráv OpenGPG "
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Šifruji zprávy gpg klíči."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Je potřeba gpg a python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "Správce sítě (network-manager)"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Autodetekce stavu sítě."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Je potřeba gnome-network-manager a python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Správa Sezení"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Sezení Gajimu je uloženo při odhlášení a znovu načteno při přihlášení."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Je potřeba python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 msgid "Password encryption"
 msgstr "Šifrování hesla"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Heslo může být bezpečně uloženo."
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Je potřeba gnome-keyring a python-gnome2-desktop."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Schopnost připojit se na servery používající SRV záznamy."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Je potřeba dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Je potřeba nslookup pro použití SRV záznamů."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Kontrola Pravopisu"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Kontrola Pravopisu psaných zpráv."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr "Vyžaduje libgtkspell."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 msgid "Notification"
 msgstr "Upozornění"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Pasivní okna oznamující nové události."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 " Je potřeba python-notify nebo python-dbus ve spojení s notification-daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Tray ikona"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Ikona v systémové liště zobrazující aktuální stav."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Je potřeba python-gnome2-extras nebo zkompilovaný trayicon modul ze zdrojáků "
-"Gajima."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Je potřeba PyGTK verze 2.10. nebo vyšší."
-
-#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatický stav"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Funkce pro měření času nečinnosti pro nastavení automatického stavu."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr "Vyžaduje knihovnu libxss."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr "Je potřeba python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Převede LaTeX výraz mezi $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7530,7 +7549,7 @@ msgstr ""
 "Je potřeba texlive-latex-base a dvipng. Dále musíte nastavit 'use_latex' na "
 "True v Editoru rozšířeného nastavení."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7538,23 +7557,23 @@ msgstr ""
 "Je potřeba texlive-latex-base a dvipng (vše je v MikTeXu). Dále musíte "
 "nastavit 'use_latex' na True v Editoru rozšířeného nastavení."
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
 msgstr "End to End šifrování zpráv"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Šifruji zprávy."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Je potřeba python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST Generátor"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7562,24 +7581,37 @@ msgstr ""
 "Generuje XHTML výstup pro RST kód (viz.: http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Je potřeba python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr "Bannery a klikatelné odkazy"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Funkce umožňující mít klikatelné URL odkazy v rozhovoru a předmětu diskuze."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Je potřeba python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Je potřeba python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Vlastnost"
 
@@ -7595,92 +7627,92 @@ msgstr "Čas"
 msgid "Progress"
 msgstr "Průběh"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Velikost: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Příjemce: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uloženo do: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Přenos soubor dokončen"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Přenos souboru zrušen"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Spojení s protistranou se nepodařilo navázat."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Příjemce: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová zpráva: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Vyber soubor k odeslání..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Popis:"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Tento soubor je používán jiným procesem."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
@@ -7689,49 +7721,49 @@ msgstr "Popis: %s"
 # #, python-format
 # msgid "Description: %s"
 # msgstr "Popis: %s"
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nemohu přepsat existující soubor \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Soubor tohoto jména již existuje a ty nemáš oprávnění k jeho přepsání."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Adresář \"%s\" není zapisovatelný"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáš oprávnění k vytváření souborů v tomto adresáři."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Uložit jako..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7739,32 +7771,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Soubor: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pauza"
 
@@ -7836,11 +7868,11 @@ msgstr ""
 "získat na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim již běží"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7848,462 +7880,28 @@ msgstr ""
 "Jiná instance Gajimu pravděpodobně již běží\n"
 "Přesto spustit?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Heslo Vyžadováno"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Zadej heslo GPG klíče pro účet %(keyid)s (účet %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Nepřiřazen GPG klíč"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Budete připojen(a) k %s bez OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Nesprávné heslo"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Tebou požadované přezdívka se již používá v diskuzi %s nebo je "
-"zaregistrována někým jiným.\n"
-"Níže vyber jinou přezdívku:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Chcete přijmout tuto žádost?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Chcete přijmout tuto žádost na účtě %s?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Spojení selhalo"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Chyba %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "chyba při odesílání %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Žádost o autorizaci"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorizace přijata"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" Vám odebral autorizaci"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
-"Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Zrušit autorizaci"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt s \"%s\" nebyl navázán"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s se přejmenoval na %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s je nyní %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s nastavil předmět na %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Každý návštěvník uvidí váš úplný JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Místnost nyní zobrazuje nedostupné členy"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "místnost nyní nezobrazuje nedostupné členy"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Nastala změna nastavení netýkající se soukromí"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Zaznamenávání historie je zapnuto"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Zaznamenávání historie je vypnuto"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Místnost není anonymní"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Místnost je částečně anonymní"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Místnost je plně anonymní"
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Pro připojení do místnosti %s je vyžadováno heslo. Zadejte"
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Nastavily jste Gajim aby používal GPG agenta, ale žádný GPG agent není "
-"spuštěný nebo vrátil chybné heslo.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Vaše heslo je neplatné"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Vaše heslo je neplatné"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG je nepoužitelné"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Tomuto kontaktu není přiřazen GPG klíč. Proto nemůžete šifrovat zprávy."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Příště _nezobrazovat"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring je nainstalován ale není správně spuštěn (proměná prostředí "
-"není asi správně nastavena)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nový E-mail pro %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Máte %d nepřečtený E-mail"
-msgstr[1] "Máte %d nepřečtené E-maily"
-msgstr[2] "Máte %d nepřečtených E-mailů"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Od: %(from_address)s\n"
-"Předmět: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s Vám chce poslat soubor."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Odstraní kontakt ze Seznamu"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Chyba při čtení souboru:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Soubor %(filename)s od %(name)s byl úspěsně přijat."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Nepodařilo se dešifrovat zprávu od %s\n"
-"Možná je falešná."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Nepodařilo se dešifrovat zprávu"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Konflikt uživatelských jmen"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Chyba."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Konflikt Zdrojů"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr "Už jsi připojen(a) k tomuto účtu se stejným zdrojem. Prosím zadej nový"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Chyba ověřování SSL certifikátu"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Chyba při ověřování SSL vertifikátu na vašem jabber serveru: %(error)s\n"
-"Chcete se přesto připojit?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignorovat tuto chybu certifikátu."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Chyba SSL certifikátu"
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-"Vypadá to, že se SSL certifikát účtu %(account)s změnil nebo někdo hackuje "
-"vaše spojení.\n"
-"Starý otisk: %(old)s\n"
-"Nový otisk: %(new)s\n"
-"\n"
-"Chcete se stále připojit a aktualizovat otisk certifikátu?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Nezabezpečené Spojení"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Chystáte se poslat vaše heslo nezabezpečeným spojením. Jste si jistý(á), že "
-"to skutečně chcete udělat?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Ano, chci se připojit nezabezpečeně"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
-"PyOpenSSL. Jste si jisti, že to chcete udělat?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "PEP uzel nebyl smazán"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP uzel %(node)s se nepodařilo odstranit: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Smajlíci byly vypnuty"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci "
-"vypnuty "
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Vámi nastavené téma smajlíků se nepodařilo načíst. Možná je potřeba "
-"aktualizovat formát v souboru emoticons.py. Viz.: http://trac.gajim.org/wiki/"
-"Emoticons "
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
-
-# FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Nelze uložit Vaše nastavení"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Zobrazí nápovědu pro konkrétní příkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "příkaz"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "zobraz nápovědu k příkazu"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Zobrazí nebo skryje okno Seznamu"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8311,50 +7909,50 @@ msgstr ""
 "Vytiskne seznam všech kontaktů v rosteru. Každý kontakt se objeví na "
 "samostatném řádku"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "zobraz pouze kontakty zadaného účtu"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše seznam registrovaných účtů"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Změní stav účtu nebo účtů"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "zpráva"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "text stavu"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8362,22 +7960,22 @@ msgstr ""
 "změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
 "účtů které mají povolenu volbu \"sync with global status\" "
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Změní stav účtu nebo účtů"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Priori_ta:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Chtěl(a) bych za_registrovat nový účet"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8386,23 +7984,23 @@ msgstr ""
 "změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
 "účtů které mají povolenu volbu \"sync with global status\" "
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazte okno rozhovoru, aby jste mohl(a) poslat zprávu kontaktu"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "pokud uvedeno, kontakt bude vzít ze seznamu kontaktů pro tento účet"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8412,29 +8010,29 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "Tělo zprávy"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp klíč"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "pokud bude uvedeno, zpráva bude zašifrována tímto veřejným klíčem"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8444,135 +8042,135 @@ msgstr ""
 "jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', "
 "nastavte prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "předmět"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "předmět zprávy"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Poslat novou zprávu do diskuze ke které jste připojeni."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID diskuze do které přijde zpráva"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o účtu"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Jméno účtu"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "soubor"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Vypíše všechna nastavení a jejich hodnoty"
 
 # FIXME: opravit, pokud je mozne prekladat i key & value
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klíč' je jméno volby, 'hodnota' je hodnota která se nastavuje"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Smaže položku nastavení"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "klíč"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "jméno volby, která bude smazána"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuální nastavení do souboru .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Přidat kontakt do Seznamu"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Přidá nový kontakt do tohoto účtu"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vrátí aktuální stav (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vrací aktuální popis stavu (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Vrací počet nepřečtených zpráv"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otevře dialog 'Začít rozhovor'"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Začít rozhovor z tohoto účtu"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Poslat vlastní XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML k odeslání"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8580,72 +8178,72 @@ msgstr ""
 "Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
 "ze všech účtů"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsluhovat xmpp:/ uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI k obsluze"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Účet s kterým chcete manipulovat"
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "Tělo zprávy"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "_Vstoupit do místnosti MUC"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "místnost"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "JID Místnosti"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "přezdívka"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Přezdívka kterou chete použít"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Heslo pro vstup do místnosti"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Účet z kterého chcete vstoupit do místnosti"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Zkontrolujte, zda Gajim již běží."
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Zobrazí nebo skryje okno ipythonu"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8654,15 +8252,15 @@ msgstr ""
 "'%s' není ve vašem Seznamu.\n"
 "Prosím uveďte účet, přes který bude odeslána zpráva."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Vypadá to, že Gajim neběží. Proto nemůžete použít gajim-remote"
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8671,16 +8269,16 @@ msgstr ""
 "Použití: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8689,7 +8287,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8698,7 +8296,7 @@ msgstr ""
 "Příliš mnoho parametrů. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8707,7 +8305,7 @@ msgstr ""
 "Parametr \"%(arg)s\" nebyl uveden. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Nesprávné uri"
 
@@ -8736,150 +8334,174 @@ msgstr "Nemůžete smazat právě používané téma"
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Už nejsi v místnosti \"%(room)s\" nebo \"%(nick)s\" odešel(a)."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Rozhovor s"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Pokračování v rozhovoru"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Každý návštěvník uvidí váš úplný JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Zaznamenávání historie je povoleno"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Nová místnost byla vytvořena"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Server přidělil nebo změnil název vaší místnosti"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
 
 # FIXME: preklad pro ban? zabanovani je hnusne
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s byl zakázán od %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s se přejmenoval na %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "Příslušnost:"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "nastavení místnosti se změnilo na vstup pouze členům"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "vypnout systém"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(actor)s nastavil(a) vztah %(nick)s na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Vztah %(nick)s byl nastaven na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(actor)s nastavil(a) postavení %(nick)s na %(role)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Postavení %(nick)s bylo nastaveno na %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je nyní %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Pokud zavřete toto okno, budete odpojen(a) z této místnosti."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Příště _nezobrazovat"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Likviduji: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8887,22 +8509,22 @@ msgstr ""
 "Místnost bude s konečnou platností zničena.\n"
 "Můžete specifikovat důvod zničení:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Také můžete specifikovat náhradní místo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -8927,58 +8549,478 @@ msgid "Details"
 msgstr "Detaily"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Chyba parsování souboru:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nemůžu zapsat do %s. Podpora správy sezení nebude fungovat"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim není výchozí Jabber klient"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete nastavit Gajim jako výchozí Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Vždy zkontroluj při startu, zda je Gajim výchozí Jabber klient."
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Rozšíření není podporováno"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Obrázek nelze uložit ve formátu %(type)s. Uložit jako %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Uložit obrázek jako..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Tebou požadované přezdívka se již používá v diskuzi %s nebo je "
+"zaregistrována někým jiným.\n"
+"Níže vyber jinou přezdívku:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Chcete přijmout tuto žádost?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Chcete přijmout tuto žádost na účtě %s?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Spojení selhalo"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Chyba %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "chyba při odesílání %s ( %s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Žádost o autorizaci"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorizace přijata"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" Vám odebral autorizaci"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
+"Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Zrušit autorizaci"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt s \"%s\" nebyl navázán"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s nastavil předmět na %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Místnost nyní zobrazuje nedostupné členy"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "místnost nyní nezobrazuje nedostupné členy"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "Nastala změna nastavení netýkající se soukromí"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Zaznamenávání historie je zapnuto"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Zaznamenávání historie je vypnuto"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Místnost není anonymní"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Místnost je částečně anonymní"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Místnost je plně anonymní"
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Pro připojení do místnosti %s je vyžadováno heslo. Zadejte"
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Nastavily jste Gajim aby používal GPG agenta, ale žádný GPG agent není "
+"spuštěný nebo vrátil chybné heslo.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Vaše heslo je neplatné"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Vaše heslo je neplatné"
+
+#: ../src/gui_interface.py:1170
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG je nepoužitelné"
+
+#: ../src/gui_interface.py:1170
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Tomuto kontaktu není přiřazen GPG klíč. Proto nemůžete šifrovat zprávy."
+
+#: ../src/gui_interface.py:1182
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring je nainstalován ale není správně spuštěn (proměná prostředí "
+"není asi správně nastavena)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nový E-mail pro %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Máte %d nepřečtený E-mail"
+msgstr[1] "Máte %d nepřečtené E-maily"
+msgstr[2] "Máte %d nepřečtených E-mailů"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Od: %(from_address)s\n"
+"Předmět: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s Vám chce poslat soubor."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Odstraní kontakt ze Seznamu"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Chyba při čtení souboru:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Soubor %(filename)s od %(name)s byl úspěsně přijat."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Nepodařilo se dešifrovat zprávu od %s\n"
+"Možná je falešná."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Nepodařilo se dešifrovat zprávu"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Konflikt uživatelských jmen"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Chyba."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Konflikt Zdrojů"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr "Už jsi připojen(a) k tomuto účtu se stejným zdrojem. Prosím zadej nový"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s Vám chce poslat soubor."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Žádost o přenos souboru"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Chyba ověřování SSL certifikátu"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Chyba při ověřování SSL vertifikátu na vašem jabber serveru: %(error)s\n"
+"Chcete se přesto připojit?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignorovat tuto chybu certifikátu."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Chyba SSL certifikátu"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Vypadá to, že se SSL certifikát účtu %(account)s změnil nebo někdo hackuje "
+"vaše spojení.\n"
+"Starý otisk: %(old)s\n"
+"Nový otisk: %(new)s\n"
+"\n"
+"Chcete se stále připojit a aktualizovat otisk certifikátu?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Nezabezpečené Spojení"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Chystáte se poslat vaše heslo nezabezpečeným spojením. Jste si jistý(á), že "
+"to skutečně chcete udělat?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ano, chci se připojit nezabezpečeně"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
+"PyOpenSSL. Jste si jisti, že to chcete udělat?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP uzel nebyl smazán"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP uzel %(node)s se nepodařilo odstranit: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Smajlíci byly vypnuty"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci "
+"vypnuty "
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Vámi nastavené téma smajlíků se nepodařilo načíst. Možná je potřeba "
+"aktualizovat formát v souboru emoticons.py. Viz.: http://trac.gajim.org/wiki/"
+"Emoticons "
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
+
+# FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Nelze uložit Vaše nastavení"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Heslo Vyžadováno"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Zadej heslo GPG klíče pro účet %(keyid)s (účet %(account)s)."
+
+#: ../src/gui_interface.py:3477
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Nepřiřazen GPG klíč"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Budete připojen(a) k %s bez OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Nesprávné heslo"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Nová diskuze"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Rád bych si Vás přidal(a) do svého seznamu"
 
@@ -8993,7 +9035,7 @@ msgstr "Kontakty"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Datum"
 
@@ -9004,7 +9046,7 @@ msgstr "Přezdívka"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Zpráva"
 
@@ -9028,239 +9070,244 @@ msgstr ""
 "\n"
 "V případě kliknutí na ANO prosím vyčkejte..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Exportuji záznamy historie..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s v %(time)s řekl(a): %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Vážně chcete smazat všechny záznamy historie vybraného kontaktu?"
 msgstr[1] "Vážně chcete smazat všechny záznamy historie vybraných kontaktů?"
 msgstr[2] ""
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Tato operace je nevratná."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vážně chcete smazat vybranou zprávu?"
 msgstr[1] "Vážně chcete smazat vybrané zprávy?"
 msgstr[2] ""
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historie rozhovorů s %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Chyba disku"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Chybová zpráva: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 #, fuzzy
 msgid "Error"
 msgstr "Chyba."
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je nyní %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Obrázek je příliš veliký"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Vážně chcete smazat vybranou zprávu?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- zprávy budou zaznamenány"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- zprvý nebudou zaznamenány"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Změnil(a) stav"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se přihlásil"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se odhlásil"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová jednoduché zpráva od %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová soukromá zpráva z místnosti %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Stahuji profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Soubor je prázdný"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informace přijata"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez opětovného připojení nemůžete zveřejnit Vaše osobní údaje."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Odesílám profil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informace NEBYLY zveřejněny"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho stav."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelné"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Budete připojen(a) k %s bez OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9269,28 +9316,28 @@ msgstr ""
 "si jistý(á), že se chcete stát neviditelným(ou)?"
 
 # FIXME: mozna nejak lepe? :/
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "nesynchronizováno"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9298,16 +9345,16 @@ msgstr ""
 "Zprávy bude možné číst později, pokud máte povolený záznam historie a "
 "kontakt je v rosteru."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Musíš si je přečíst před smazáním transportu."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9315,11 +9362,11 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9328,68 +9375,68 @@ msgstr ""
 "Už více nebudete moci posílat ani přijímat zprávy od kontaktů z těchto "
 "transportů:%s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Odstranit také všechny kontakty v této skupině z Vašeho rosteru"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude smazán z Vašeho rosteru"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Chystáte se smazat \"%(name)s\" (%(jid)s) z vašeho rosteru.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9398,11 +9445,11 @@ msgstr ""
 "odpojeného."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9410,16 +9457,16 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Chci aby tento kontakt věděl o mém stavu i po odstranění"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty budou smazány z Vašeho rosteru"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9428,33 +9475,33 @@ msgstr ""
 "Smazáním těchto kontaktů:%s\n"
 "také zrušíte autorizaci. Kontakty Vás tak vždy uvidí jako odpojeného."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9462,12 +9509,12 @@ msgstr ""
 "Tvůj server nepodporuje ukládání metakontaktů. Tyto informace nebudou při "
 "přístím připojení uloženy."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9477,11 +9524,11 @@ msgstr ""
 "jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v "
 "transportech."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9489,12 +9536,12 @@ msgstr[0] "Chcete poslat %s tento soubor:"
 msgstr[1] "Chcete poslat %s tyto soubory:"
 msgstr[2] "Chcete poslat %s tyto soubory:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Odeslat %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Pošle soubor kontaktu"
@@ -9504,159 +9551,159 @@ msgstr "Pošle soubor kontaktu"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "Spravovat _záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "_Nastavit služby..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Maximalizovat Vše"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Provést příkaz..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "Transporty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Odpojit"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Odpojit"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Připojit se do diskuze"
 
 # FIXME: nejak divne, asi spatne prelozene -ne myslim ze to je ok
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
 # FIXME: hmm kdovi co to je..
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Čekání na výsledky"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Chyba v příchozím datagramu"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Žádný výsledek"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Chyba zápisu na disk"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Předmět: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Potvrdit volby pro toto sezení"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9671,7 +9718,7 @@ msgstr ""
 "\n"
 "\t\tJsou tyto volby přijatelné?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9686,116 +9733,116 @@ msgstr ""
 "\n"
 "Pokračovat v komunikaci?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s této diskuze"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr "[blokováno]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr "[minimalizováno]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslední stav: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Spojeno"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Odpojenol"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Autorizace: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Hudba:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Stáhnout"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Nahrát"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pozastaveno"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9803,62 +9850,116 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
 msgstr "?Time:Neznámý"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vztah</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "Tento kontakt zajímá Váš stav, ale Vy se nezajímate o jeho stav"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "Vy se zajímáte o stav kontaktu, ale on se nezajímá o Váš stav"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vy i kontakt se zajímáte o stav toho druhého"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Vy ani kontakt se nezajímáte o stav toho druhého"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekáte na odpověď kontaktu na vaši žádost o autorizaci"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Není zde žádný nevyřízený požadavek."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Příchozí zpráva:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Odchozí zpráva:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-close"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Host %s nastevený jako ft_add_hosts_to_send má rozšířenou volbu chybnou, "
+#~ "bude ignorována."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP heslo nebylo zadáno"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Pro pokračování v přijímání a odesílání zpráv se musíte znovu připojit."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Nejsi připojen nebo viditelný pro ostatní. Tvoje zpráva nemůže být "
+#~ "odeslána."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Tato zpráva je zašifrovaná]"
+
+#~ msgid "%i days ago"
+#~ msgstr "před %i dny"
+
+#~ msgid "Trayicon"
+#~ msgstr "Tray ikona"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Ikona v systémové liště zobrazující aktuální stav."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Je potřeba python-gnome2-extras nebo zkompilovaný trayicon modul ze "
+#~ "zdrojáků Gajima."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Je potřeba PyGTK verze 2.10. nebo vyšší."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Přidat zvláštní _upozornění"
 
diff --git a/po/da.po b/po/da.po
index c23efeb0a..4518efb26 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,10 +5,10 @@
 # Niels Felsted Thorsen <felsted@fsfe.org>, 2007, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: Gajim 0.12\n"
+"Project-Id-Version: Gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-19 23:45+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-11-18 19:33+0100\n"
 "Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
 "Language-Team:  <>\n"
 "MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgstr "<b>Vælg venligst en server<b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -104,9 +104,8 @@ msgstr ""
 "SHA1 fingeraftryk af certifikatet:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Brug godkendelse"
+msgstr "Anonym godkendelse"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -133,7 +132,7 @@ msgstr "Hvis valgt vil Gajim huske adgangskoden for denne konto"
 #: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
 msgid "Manage..."
-msgstr "Kan håndteres..."
+msgstr "Håndter..."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
@@ -281,9 +280,9 @@ msgstr "Redigere Personlig Information..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -292,9 +291,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "General"
 
@@ -354,21 +353,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Information om dig, som er gemt på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Ingen nøgle er valgt"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Ingen"
 
@@ -474,7 +473,6 @@ msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
 msgstr "_Tilpas til status"
 
@@ -483,9 +481,8 @@ msgid "Accounts"
 msgstr "Kontoer"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Brug godkendelse"
+msgstr "Anonym godkendelse"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -496,9 +493,8 @@ msgstr ""
 "usikker forbindelse."
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
-msgstr "T_ilslut når Gajim startes"
+msgstr "Tilslut _når Gajim startes"
 
 #: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
@@ -526,8 +522,8 @@ msgstr ""
 "Du bør også ændre opsætning tilsvarende på en evt. brandmur."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -541,68 +537,57 @@ msgid "Mer_ge accounts"
 msgstr "Fle_t kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Om_døb"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
-msgstr "Send hold-i-live pakker"
+msgstr "Send hold-i-live pa_kker"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use G_PG Agent"
-msgstr "Brug GPG _Agenten"
+msgstr "Brug G_PG Agenten"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
-msgstr "Brug tilpasset værtsnavn/port"
+msgstr "Brug tilpasset værtsnavn/p_ort"
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Brug personlig port:"
+msgstr "Brug pers_onlig port:"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "Redigere Personlig Information..."
+msgstr "R_ediger Personlig Information..."
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Aktiver"
+msgstr "Aktiv_er"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
 msgstr "_Værtsnavn:"
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Kan håndteres..."
+msgstr "Hå_ndter..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
-msgstr "_Port:"
+msgstr "_Port: "
 
 #: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "Ad_var mig før jeg bruger en usikker forbindelse"
 
 #: ../data/glade/accounts_window.glade.h:63
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
-msgstr "brug HTTP_PROXY miljøvariablen"
+msgstr "br_ug HTTP__PROXY miljøvariablen"
 
 #: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
@@ -950,7 +935,7 @@ msgstr "Sidst ændret:"
 msgid "New entry received"
 msgstr "Ny hændelse modtaget"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Du har modtaget en ny hændelse:"
 
@@ -994,11 +979,11 @@ msgstr "Skriv en ny adgangskode:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Skriv din nye status besked</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Aktivitet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Humør:"
 
@@ -1078,9 +1063,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Tilskriv Open_PGP Nøgle..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Kør Kommando..."
+msgstr "Kør K_ommando..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1088,8 +1072,8 @@ msgstr "Ændre _Grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -1102,8 +1086,8 @@ msgid "Remo_ve"
 msgstr "_Fjern"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Send _Tilpasset Status"
 
@@ -1136,8 +1120,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Till_ad ham/hende at se min status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Bloker"
 
@@ -1148,7 +1132,7 @@ msgstr "_Nægt ham/hende at se min status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Historie"
 
@@ -1169,8 +1153,8 @@ msgid "_Subscription"
 msgstr "_Abonnement"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Fjern blokering"
 
@@ -1258,7 +1242,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Fortsæt"
 
@@ -1266,7 +1250,7 @@ msgstr "_Fortsæt"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Påmind mig når en filoverførsel er færdig"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Åbn folderen med filen"
 
@@ -1294,7 +1278,7 @@ msgstr ""
 "Kontakt række\n"
 "Samtale Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Fed"
 
@@ -1314,11 +1298,11 @@ msgstr "Gajim Tema Tilpasning"
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Ikke aktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1366,7 +1350,7 @@ msgstr "Ændre _Emne..."
 msgid "Configure _Room..."
 msgstr "Tilpas _Rum..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Bogmærke"
 
@@ -1455,8 +1439,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Loghistorie Håndterer</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Slet"
 
@@ -1486,7 +1471,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Søg Database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Samtale Historie"
 
@@ -1510,11 +1495,10 @@ msgid "_Log conversation history"
 msgstr "_Log samtale historie"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "Bogmærk dette rom (Ctrl+B)"
+msgstr "Bogmærk dette rom"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Bliv med i en Gruppe Samtale"
 
@@ -1541,8 +1525,8 @@ msgstr "For nylig:"
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Bliv med:"
 
@@ -1570,7 +1554,7 @@ msgstr "Minimer ved Automatisk Deltagelse"
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1599,14 +1583,14 @@ msgid "<b>Settings</b>"
 msgstr "<b>Opsætning</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
 msgstr ""
 "HTTP Tilslutning\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1617,32 +1601,28 @@ msgid "Pass_word:"
 msgstr "Adgangs_kode"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgstr "Proxy _vært:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
-msgstr ""
+msgstr "Brug HTTP prox_y"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Brug godkendelse"
+msgstr "Brug proxy godkendelse"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
-msgstr ""
+msgstr "_BOSH URL:"
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Type:"
+msgstr "_Type:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
@@ -1681,22 +1661,30 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Hvis en liste over følelsesikoner (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
-#, fuzzy
 msgid "Show a list of formattings"
-msgstr "Hvis en liste over følelsesikoner (Alt+M)"
+msgstr "Hvis en liste over følelsesikoner"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Vis en menu med avancerede funktioner (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Vis kontaktens profil (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Send"
 
@@ -1794,7 +1782,7 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:26
 msgid "Allow sound when I'm _busy"
-msgstr ""
+msgstr "Tillad lyde når jeg er o_ptaget"
 
 #: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
@@ -1811,7 +1799,7 @@ msgstr ""
 "Automatisk genkend hvergang Gajim starter\n"
 "Altid brug GNOME standard programmer\n"
 "Altid brug KDE standard programmer\n"
-"Altid brug XFCE4 standard programmer\n"
+"Altid brug Xfce standard programmer\n"
 "Tilpasset"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1827,6 +1815,16 @@ msgid "Configure color and font of the interface"
 msgstr "Konfigurér farve og skrifttyper for brugergrænsefladen"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Samtale besked:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Kontakt navn"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1840,31 +1838,31 @@ msgstr ""
 "Frigjort kontaktvindue med samtale vindue grupperet per konto\n"
 "Frigjort kontaktvindue med samtale vindue grupperet per type"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Vis kontakternes _aktivitet i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis kontak_ternes melodier i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis kontakternes humør i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1874,7 +1872,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "vise i samtalevinduerne."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1884,7 +1882,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "sende til modparten."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1892,31 +1890,31 @@ msgstr ""
 "Gajim vil påminde dig med et pop op vindue i højre bund af skærmen når en "
 "kontakt logger af"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Skjul alle knapperne i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Hvis valgt vil Gajim også inkludere information om senderen af den nye e-post"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Hvis valgt vil Gajim ændre status til Væk når computeren ikke bliver brugt."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1924,7 +1922,7 @@ msgstr ""
 "Hvis valgt vil Gajim ændre status til Ikke Tilgængelig når computeren ikke "
 "har været brugt i endnu længere tid"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1932,7 +1930,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
 "samtaler"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1940,23 +1938,23 @@ msgstr ""
 "Hvis valgt vil Gajim vise status beskeder af kontakter under kontaktnavnet i "
 "kontaktvinduet og i gruppe samtaler"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "Hvis valgt vil Gajim vise kontakternes aktivitet i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Hvis valgt vil Gajim vise kontakternes humør i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Hvis valgt vil Gajim vise i kontaktvinduet, hvilken melodi kontakten spiller"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1966,7 +1964,7 @@ msgstr ""
 "intet sprog er valgt ved at højreklikke i indtastningsfeltet, vil standard "
 "sproget blive brugt for denne kontakt eller gruppe samtale."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1976,7 +1974,7 @@ msgstr ""
 "kontakter. Brug med forsigtighed fordi det vil blokere alle beskeder fra "
 "alle kontakter som ikke er i kontaktvinduet."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1986,7 +1984,7 @@ msgstr ""
 "opmærksom på når der bruges E2E kryptering må den anden i samtalen godkende "
 "evt. logning, ellers vil samtalen i blive logget."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1994,7 +1992,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise en påmindelse når en ny e-post er modtaget via "
 "Gmail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2004,7 +2002,7 @@ msgstr ""
 "kontakt fra MSN vil have det tilsvarende msn ikon for status tilsluttet, "
 "borte, Travlt, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2012,7 +2010,7 @@ msgstr ""
 "Hvis aktiveret vil Gajim i spørge for en status besked. Den valgte standard "
 "besked vil blive brugt i stedet."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2020,50 +2018,53 @@ msgstr ""
 "Hvis valgt vil Gajim erstatte tekst smileys som denne ':)' med den "
 "tilsvarende animerede eller statiske grafiske følelsesikon"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Log krypt_eret samtale session"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Gør samtalevinduer _kompakte"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Hå_ndtere..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Aldrig\n"
+"Kun ved ventende hændelser\n"
+"Altid"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Påmindelser"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Påmind mig om kontakter logger _ind"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Påmind mig om kontakter som logger u_d"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Påmind mig ved ny _GMail e-post"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Personlig Hændelser"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Afspil _lyde"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2073,24 +2074,23 @@ msgstr ""
 "Påmind mig om det\n"
 "Hvis kun i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
-msgstr "_Vis hændelse i systembakken"
+msgstr "Vis systembakken:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Logge _ind"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Log _af"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2099,28 +2099,27 @@ msgstr ""
 "valgt\n"
 "vil Gajim kun vise den rå tekst."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Status _ikonsæt:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2128,10 +2127,11 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 "Den automatiske jeg er væk status besked. Hvis tom vil Gajim ikke ændre den "
-"nuværende status besked"
+"nuværende status besked\n"
+"$S vil blive erstattet med den forrige status besked\n"
+"$T vil blive erstattet med auto-away tidsudløb"
 
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2139,105 +2139,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Den automatiske jeg er ikke tilgængelig status besked. Hvis tom vil Gajim "
-"ikke ændre den nuværende status besked"
+"ikke ændre den nuværende status besked\n"
+"$S vil blive erstattet med den forrige status besked\n"
+"$T vil blive erstattet med auto-not-available timeout"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Brug _transportens ikonsæt"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Brug system stan_dard"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Når en ny hændelse er modtaget:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Fejl besked: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Kælenavn:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "_Væk efter:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Netlæser:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "Vis samtalestatus påmin_delser:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "Føl_elsesikoner:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Filhåndterer:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "Frem_hæv stavefejl"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hændelser fra kontakter som ikke er i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorer rigt indhold i indkommende beskeder"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Indkommende besked:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Log status ændringer hos kontakter"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_E-post klient:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "Ikke tilgæ_ngelig efter:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Åbn..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Udgående besked:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Nulstil til Standard Farver"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "_Send samtalestatus påmindelser:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Status besked:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "_URL fremhævning:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Vinduets adfærd:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "i _gruppe samtaler"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "i _kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutter"
 
@@ -2270,9 +2274,8 @@ msgid "All"
 msgstr "Alle"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "Alle efter abonnering"
+msgstr "Alle (inkluderende abonnering)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2290,7 +2293,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Bestil:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Privatlivs Liste"
 
@@ -2434,7 +2437,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Titel:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
@@ -2494,8 +2497,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Kan fjernes"
 
@@ -2504,24 +2507,25 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>nogen@etsted.com</b> vil gerne at du <b>tilføjer</b> nogen kontakter i "
+"dit kontaktvindue."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Beskedtekst <for tiden ubrugt, så den er skjult som standard>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Bytte af punkt i kontaktvinduet"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-luk"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-luk"
+msgid "gtk-cancel"
+msgstr "luk"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2548,9 +2552,8 @@ msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Vis _Afkoblede Kontakter"
+msgstr "Vis Kun _Aktive Kontakter"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2579,7 +2582,7 @@ msgstr "_Handlinger"
 msgid "_Contents"
 msgstr "_Indhold"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "R_ediger"
 
@@ -2620,11 +2623,11 @@ msgid "_Add contact"
 msgstr "Tilføj Kont_akt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Søg"
 
@@ -2644,10 +2647,6 @@ msgstr "Registrer til"
 msgid "_Cancel"
 msgstr "_Afbryd"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2756,9 +2755,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>Stat:</b>"
+msgstr "<b>Kontakt tid:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
@@ -2857,286 +2855,269 @@ msgstr "Resource:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Annuller bekræftelse"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 "Du er i færd med at køre en kommando. Er du sikker på du vil afbryde den?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Tjeneste sendte malformeret data"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Tjeneste ændrede sessionsnøglen."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Tjeneste returnerede en fejl."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktiveret"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Ikke aktiveret"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Heltal"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Farve"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Værdi"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Skjult"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Du har modtaget en ny hændelse:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Du har modtaget en nye hændelser (og %(count)d er ikke vist):"
+msgstr[1] "Du har modtaget en nye hændelser (og %(count)d er ikke vist):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretonsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Græsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Britisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norsk (bokmål)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Hollandsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Kinesisk"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Sprog for stavekontrollen"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "En tilslutning er ikke tilgængelig"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Din besked kan ikke blive sendt før du er tilsluttet."
 
-#: ../src/chat_control.py:820
-#, fuzzy
+#: ../src/chat_control.py:861
 msgid "Underline"
-msgstr "Uforklaret"
+msgstr "Understregning"
 
-#: ../src/chat_control.py:821
-#, fuzzy
+#: ../src/chat_control.py:862
 msgid "Strike"
-msgstr "Syg"
+msgstr "Streg"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
-msgstr ""
+msgstr "Font"
 
-#: ../src/chat_control.py:853
-#, fuzzy
+#: ../src/chat_control.py:894
 msgid "Clear formating"
-msgstr "Kontakt Information"
+msgstr "Fjern formatering"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Virkelig send denne fil?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Hvis du sender en fil til %s, vil han eller hun få at vide dit rigtige "
 "Jabber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering aktiveret"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Ikke i Kontaktvinduet"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "En liste over aktive, færdige og stoppede filoverførsler"
+msgstr "Denne kontakt understøtter ikke fil overførsler."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
+"Du trænger den rigtige JID fra kontakten for at kunne sende ham eller hende "
+"en fil."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Ukendt Artist"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Ukendt Titel"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Ukendt Kilde"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> af <i>%(artist)s</i>\n"
-"fra <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøgle valgt"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3144,50 +3125,50 @@ msgstr ""
 "Ingen GPG nøgle er valgt for denne kontakt. Derfor kan du ikke kryptere "
 "beskeder med GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Session VIL blive logget"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Session VIL IKKE blive logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "og godkendt"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
 msgstr "og IKKE godkendt"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3196,23 +3177,23 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale session %(logged)s blive logget."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Session forhandling annulleret"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Denne session er krypteret"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr " og VIL blive logget"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr " og VIL IKKE blive logget"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3220,25 +3201,25 @@ msgstr ""
 "Kontaktens identitet er ikke verificeret Tryk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende besked var IKKE krypteret"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Den følgende besked var krypteret"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3246,15 +3227,15 @@ msgstr ""
 "Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
 "miste denne besked."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Database Fejl"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3263,7 +3244,7 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den eller fjerne den "
 "(hele historikken vil tabes)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nu %(status)s"
@@ -3272,23 +3253,23 @@ msgstr "%(name)s er nu %(status)s"
 msgid "creating logs database"
 msgstr "opretter log database"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er en fil, men burde være et katalog"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim vil nu slutte"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er et katalog men burde være en fil"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "opretter %s katalog"
@@ -3351,10 +3332,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Vælg de gruppesamtaler du vil forlade"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
@@ -3372,7 +3353,7 @@ msgstr "Alle ulæste beskeder er blevet videresendt."
 
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Spil en lyd når brugeren er optaget"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3383,6 +3364,7 @@ msgstr ""
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
+"Vis kun brugere på net og brugere klar for en samtale i kontaktvinduet."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3417,51 +3399,47 @@ msgstr ""
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
+"Når skal systembakke ikonet vises? Kan være 'never', 'on_event', 'always'."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Ugyldigt kælenavn"
+msgstr "Indgående farve på kælenavn."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Farve på udgående kælenavn."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Indgående farve på tekst."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Udgående farve på tekst."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "status besked tekst"
+msgstr "Status besked farve på tekst."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Ugyldigt kælenavn"
+msgstr "Udgående farve på kælenavn."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Ændre kælenavn"
+msgstr "Udgående font på kælenavn."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Indgående font på tekst."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Udgående font på tekst."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "status besked tekst"
+msgstr "Status besked font på tekst"
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3471,9 +3449,9 @@ msgstr ""
 "kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "standard"
 
@@ -3577,16 +3555,23 @@ msgstr "Hvor mange minutter skal sidste linjer fra forrige samtale vare."
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
 msgstr ""
+"Hvor mange linjer skal hentes fra serveren når man deltager i en "
+"gruppesamtale."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr ""
+"Hvor mange minutter tilbage skal der hentes log fra når man deltager i en "
+"gruppesamtale."
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Hvor mange sekunder skal der ventes før der prøves at oprette en ny "
+"forbindelse til en konference som du er blevet afbrudt fra. Sæt værdien til "
+"0 for at forhindre at der prøves at oprette ny forbindelse."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3674,6 +3659,8 @@ 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 ""
+"Spørg før et faneblad i samtale vinduet lukkes hvis der kan mistes dat "
+"(samtale, privat samtale, gruppe samtale som ikke vil minimere)"
 
 #: ../src/common/config.py:192
 msgid ""
@@ -3919,21 +3906,19 @@ msgstr ""
 "streng betyder at vi aldrig viser vinduet."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
-"streng betyder at vi aldrig viser vinduet."
+"Skal vi vise bekræftelses vinduet for blokering af kontakter? Tom streng "
+"betyder at vi aldrig viser vinduet."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
+"Skal vi vise bekræftelses vinduet for ændring af personlig status? Tom "
 "streng betyder at vi aldrig viser vinduet."
 
 #: ../src/common/config.py:259
@@ -3955,13 +3940,12 @@ msgstr ""
 "konto adgangskoder."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
-"konto adgangskoder."
+"Hvis sandt vil Gajim bruge KDE Wallet (hvis kwelletcli er tilgængelig) til "
+"at gemme konto adgangskoder."
 
 #: ../src/common/config.py:262
 msgid ""
@@ -4029,29 +4013,35 @@ msgstr ""
 "vist. Jo højere jo større."
 
 #: ../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)"
 msgstr ""
 "Gyldige uri skemaer. Kun skemaer i denne liste vil blive accepteret som "
-"\"rigtige\" uri."
+"\"rigtige\" uri. (mailto og xmpp bliver behandlet separat)"
 
 #: ../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 ""
+"Spørg om offline status beskeder til alle offline kontakter når en "
+"forbindelse til en konto bliver etableret. ADVARSEL: Dette forårsager en "
+"masse forespørgsler!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Hvis sandt, vil færdiggørelse i gruppe samtaler fungere på samme måde som "
+"færdiggørelse i kommandolinjen"
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"Når bliver selv kontakt rækken vist. Kan være \"always\", "
+"\"when_other_resource\" eller \"never\""
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4078,12 +4068,15 @@ msgstr "Hvis valgt, gendan den sidste status som var brugt."
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
+"Hvis sandt, kontakter som beder om autorisering vil automatisk blive "
+"accepteret."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
-msgstr "Hvis Falsk vil du ikke længere se en avatar i samtale vinduet."
+msgstr ""
+"Hvis Falsk vil denne konto blive deaktiveret og vil ikke vises i "
+"kontaktvinduet."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4125,14 +4118,13 @@ msgstr "Mellemrums adskilt liste af ssl fejl som skal ignoreres."
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Mellemrum sendt efter inaktivitet"
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "XMPP ping sendt efter inaktivitet"
 
 #: ../src/common/config.py:323
-#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4145,7 +4137,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 tilpasning"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4153,15 +4145,15 @@ msgstr ""
 "Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
 "indstillingen for filoverførsler."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Svar til modtagelses forespørgsel"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Sendte modtagelses forespørgsler"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4169,11 +4161,11 @@ msgstr ""
 "Ved forhandling af en krypteret session, skal Gajim da antage at du vil have "
 "dine beskeder logget?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP aktiveret for denne kontakt?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4181,101 +4173,101 @@ msgstr ""
 "Skal Gajim automatisk starte en krypteret session med denne kontakt når det "
 "er muligt?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprog som vi vil bruge til at kontrollere for stavefejl"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "alt eller mellemrums separeret status"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nej', eller 'begge'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'ja', 'nej' eller ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Snart tilbage"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så læg en besked."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbejder"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Jeg arbejder."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Jeg snakker i telefon."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Ude"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Jeg er ude og nyder livet."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Jeg er tilgængelig."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgængelig."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Ikke forstyr."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Farvel!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4284,99 +4276,98 @@ msgstr ""
 "muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
 "kælenavn."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en hvilken som helst MUC besked ankommer."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "grøn"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "købmandsvarer"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "menneske"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marint"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Forkert vært"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings information for transporten %s har ikke ankommet i tide"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
-msgstr "Registrer til %s"
+msgstr "Tilslutning lykkedes"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Tilslutning med agenten %s lykkedes"
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
-msgstr "Tilslutning Fejlede"
+msgstr "Tilslutning fejlede"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
+"Tilslutning med agenten %(agent)s mislykkedes med fejlen %(error)s: %"
+"(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Disk skrivefejl"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Usynlighed er ikke understøttet"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s understøtter ikke usynlighed."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Ugyldigt Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
+msgstr "En besked fra en ugyldig JID blev modtaget, den er blevet ignoreret."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4385,7 +4376,7 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den (se http://trac."
 "gajim.org/wiki/DatabaseBackup) eller fjerne den (hele historikken vil tabes)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kælenavn er ikke tilladt: %s"
@@ -4393,76 +4384,76 @@ msgstr "Kælenavn er ikke tilladt: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Maksimalt antal brugere for %s er nået"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er bandlyst fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalen %s eksisterer ikke."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oprettelse er begrænset."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Rummet er blevet ødelagt"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan deltage i dette rum i stedet: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nu på %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "forespørsel om ophør på abonnement fra %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nu abonnerer vi ikke længere på %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4600,80 +4591,109 @@ msgstr "Nøglebrug indeholder ikke certifikat signering"
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Det er ikke mulig at sende en besked til %s, denne JID er ikke gyldig."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+"Den fjerne tilstedeværelse er ikke signeret og en nøgle blev ikke angivet."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "Kontaktens nøgle (%s) passer ikke til den angivne nøgle i Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Denne besked er *krypteret* (Se :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Emne: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Tilslut manuelt."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Server %(name)s svarede forkert på indskrivnings forespørgslen: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serveren %s gav en anderledes registreringsform"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukendt SSL fejl: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Forkert svar"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s svarede forkert på indskrivnings forespørgslen: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke tilslutte til \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Kontroller din tilslutning eller forsøg igen senere."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Gemt i: %s"
+msgstr "Server svarede: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke tilslutte til kontoen %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "Tilslutning til kontoen \"%s\" er blevet afbrudt. Prøv at tilslutte igen."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Ægtheden af %s certifikatet kan være ugyldig."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4682,7 +4702,7 @@ msgstr ""
 "\n"
 "SSL Fejl: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4691,24 +4711,24 @@ msgstr ""
 "\n"
 "Ukendt SSL fejl: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Kontroller din tilslutning eller prøv igen senere"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Godkendelse fejlede med \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Venligst kontroller om dit logind og adgangskode er korrekt."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Fejl under fjernelse af privatlivs liste"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4717,77 +4737,43 @@ msgstr ""
 "Privatlivs liste %s er ikke blevet fjernet. Den er måske aktiv i en af dine "
 "tilsluttede ressourcer. Deaktivér den og prøv igen."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Det er ikke mulig at sende tomme filer"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-"Den fjerne tilstedeværelse er ikke signeret og en nøgle blev ikke angivet."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Kontaktens nøgle (%s) passer ikke til den angivne nøgle i Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Denne besked er *krypteret* (Se :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Emne: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Inviter _Kontakter"
+msgstr "Sendte kontakter:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grund af usynlig status"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Tilslutning Fejlede"
+msgstr "Tilslutning fejlede"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+msgstr "Frakobling fra serveren %(server)s mislykkedes: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Iagttagere"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Ikke i kontaktvindue"
 
@@ -4803,7 +4789,7 @@ msgstr "Gajims D-Bus evner kan ikke bruges"
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus kører ikke korrekt på denne maskine"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -4913,7 +4899,7 @@ msgid "twenty five past %(0)s"
 msgstr "femogtyve over %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "half past %(0)s"
 msgstr "halv %(1)s"
 
@@ -5035,7 +5021,7 @@ msgstr "Tilgængelig for samtale"
 msgid "_Available"
 msgstr "Ti_lgængelig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Tilgængelig"
 
@@ -5153,77 +5139,77 @@ msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d besked venter"
 msgstr[1] "%d beskeder venter"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr "fra rum %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr "fra bruger %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " fra %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hændelse venter"
 msgstr[1] "%d hændelser venter"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5239,652 +5225,673 @@ msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldigt logniveau"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fejl: kan ikke åbne %s for læsning"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "flytter log databasen til flere indeks"
 
 #: ../src/common/passwords.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "fra konto %s"
+msgstr "XMPP konto %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Bange for"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Forbavset"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Erotisk"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Gal"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Misfornøjet"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Ængstelig"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Vækket"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Skamfuld"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Keder mig"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Modig"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Rolig"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Forsigtig"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Fryser"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Sikker"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Forvirret"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Dybsindig"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Tilfreds"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Forskruet"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Vanvittig"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Kreativ"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Nysgerrig"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Nedslået"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Deprimeret"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Væmmes"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Forfærdet"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Forstyrret"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Misundelig"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Spændt"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Flirtende"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustreret"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Taknemlig"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Sørge"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Gnaven"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Glad"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Håbefuld"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Varm"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Ydmyg"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Ydmyget"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Sulten"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Såret"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Imponeret"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Ærefrygt"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Forelsket"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Indigneret"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Interesseret"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Uovervindelig"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Ensom"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Tabt"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Heldig"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Ondskabsfuld"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Gnaven"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervøs"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Oprørt"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Spøgefuld"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Stolt"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Afslappet"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Lettet"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Hvileløs"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Trist"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Tilfreds"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Seriøs"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Sjokeret"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Genert"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Syg"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Stresset"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Stærk"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Taknemlig"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Tørstig"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Træt"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Uforklaret"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Svag"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Bekymret"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Laver Husarbejde"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Køber ind"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Gør Rent"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Laver Mad"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Gør Vedligeholdsarbejde"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Vasker op"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Vasker Tøj"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Laver Havearbejde"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Løber et Ærinde"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Går tur med hunden"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Drikker"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Drikker en Øl"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Drikke Kaffe"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Drikker Te"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Spiser et lille Mellemmåltid"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Spiser Morgenmad"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Spiser Middag"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Spiser Frokost"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Træner"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Cykler"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Danser"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Vandrer"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Jogger"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Dyrker Sport"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Løber"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Står på ski"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Træner"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Plejer"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "I Spabad"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Børster Tænder"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Bliver Klippet"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Barberer"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Tager et Bad"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Tager et Brusebad"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Har en Aftale"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Fridag"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Hænge ud"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Skjult"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "Få Ferie"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Ber"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Planlagt Ferie"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Tænker"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Slapper af"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Fisker"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Spiller"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Går ud"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Fester"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Læser"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Køber ind"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Ryger"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Socialiserer"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Solbader"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Ser TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Ser en film."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Taler"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "I det virkelige liv"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Snakker i telefon."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Taler i Video Telefon"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Rejser"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Pendler"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Kører"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "I en Bil"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "På en Bus"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "Flyver"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "Kører i tog"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "På Rejse"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Går"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Koder"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "I et Møde"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Studerer"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Skriver"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Ukendt Artist"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Ukendt Titel"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Ukendt Kilde"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> af <i>%(artist)s</i>\n"
+"fra <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5908,38 +5915,11 @@ msgstr ""
 "[Dette er en del af en krypteret session. Hvis du ser denne besked gik noget "
 "galt.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Værten %s du konfigurerte i ft_add_hosts_to_send avancerte indstillinger er "
-"ikke gyldig, så den bliver ignoreret."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP adgangskode blev ikke givet"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"For at kunne fortsætte med at sende og modtage beskeder, må du tilslutte dig "
-"igen."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi fejl"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5948,52 +5928,44 @@ msgstr ""
 "%s\n"
 "Link-local beskeder vil sandsynligvis ikke virke ordentligt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ikke i stand til at tildele port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontroller venligst om avahi-dæmonen kører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke ændre status på kontoen \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Du er ikke tilsluttet eller synlig for andre. Din besked kunne ikke sendes."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Denne besked er krypteret]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Din besked kunne ikke sendes."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt er afkoblet. Din besked kunne ikke sendes."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6006,24 +5978,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fejl ved tilføjelse af tjeneste. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Ikke aktiveret"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Standard Besked"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbog for sproget %s er ikke tilgængelig"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6032,70 +6004,69 @@ msgstr ""
 "For at bruge stavekontrollen må du installer en %s ordbog, eller vælge et "
 "andet sprog ved indstillingen for sprog til stavekontrollen."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "status besked Titel"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "status besked tekst"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Log ind igen nu?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Hvis du vil at alle ændringerne skal træde i kraft nu, må du logge ind igen."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "Det er ikke muligt at bruge OpenPGP på denne computer"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Ulæste hændelser"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Læs alle ventende hændelser før denne konto fjernes."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har en åben samtale med kontonavnet %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Alle samtale og gruppesamtale vinduer vil blive lukket. Vil du fortsætte?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Du er for øjeblikket tilsluttet til serveren"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "For at ændre kontonavnet må du afbryde din tilslutning"
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "For at ændre kontonavnet må du læse alle ventende hændelser."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Kontonavnet er allerede i brug"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6103,145 +6074,143 @@ msgstr ""
 "Dette navn er allerede brugt til en af dine andre kontoer. Vælg venligst et "
 "andet navn."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Ugyldigt kontonavn"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Kontonavnet kan ikke være tomt."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Kontonavnet kan ikke indeholde mellemrom."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Omdøb Konto"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Indtast et nyt navn for kontoen %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Et Jabber ID må være på formen \"bruger@servernavn\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Ugyldig indgang"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Personlig port må være et port nummer."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Forsøg på at hente krypteringsnøgler mislykkedes"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "Der opstod et problem under forsøget på at hente dine OpenPGP nøgler."
+msgstr "Der er ikke nogen hemmelig OpenPGP nøgle tilgængelig."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøgle Valg"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Vælg din OpenPGP Nøgle"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Ingen konto ved det navn er tilgængelig"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Du må oprette en konto før du kan redigere din personlige information."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Uden en tilslutning kan du ikke redigere din personlige information."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Din server understøtter ikke Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke gemme din personlige information."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "For at ændre kontonavnet må du afbryde din tilslutning"
+msgstr "For at deaktivere din konto må du afbryde din tilslutning."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Den Lokale Konto eksisterer allerede."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Omdøb eller fjern den før du aktiverer link-local beskeder."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Liste over bandlyste"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Ejer Liste"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Kælenavne"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Bandlysning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6249,11 +6218,11 @@ msgstr ""
 "<b>Hvem vil du bandlyse?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Tilføj Medlem..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6261,11 +6230,11 @@ msgstr ""
 "<b>Hvem vil du gøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Tilføj Ejer..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6273,11 +6242,11 @@ msgstr ""
 "<b>Hvem vil du gøre til ejer?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Tilføj Administrator..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6285,8 +6254,7 @@ msgstr ""
 "<b>Hvem vil du gøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6302,88 +6270,86 @@ msgstr ""
 "4. domæne (domænet træffer, ligeledes et hvilken som helst bruger@domæne,\n"
 "domæne/resource, eller adresse indeholdende et subdomæne."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Gem adgangskode"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Hvis du fjerne den vil tilslutningen tabes."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Gå kun ind og ud"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Ny Gruppe Samtale"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Dette bogmærke er ugyldigt"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Fyld ud server og rum tekstindtastningsfelterne eller fjern dette bogmærke."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Ugyldigt kælenavn"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Kælenavn er ikke tilladt: %s"
+msgstr "Tegn ikke tilladt: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Ugyldigt server"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Ugyldig indgang"
+msgstr "Ugyldig rum"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Kontoen er blevet tilføjet med succes"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6393,33 +6359,33 @@ msgstr ""
 "eller senere ved at vælge kontoens menupunkt under Rediger menuen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto er blevet oprettet med succes"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Ugyldigt brugernavn"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Du må give et brugernavn for at konfigurere denne konto."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Anfør en server som du vil registrere dig ved."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Certifikatet er allerede i filen"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dette certifikat er allerede i filen %s, så det bliver ikke tilføjet igen."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6434,7 +6400,7 @@ msgstr ""
 "SSL Fejl: %(error)s\n"
 "Vil du stadig prøve at forbinde til denne server?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6445,63 +6411,63 @@ msgstr ""
 "Certifikatets SHA1 fingeraftryk:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Under oprettelsen af kontoen opstod der en fejl"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Kontonavnet er i brug"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Du har allered en konto med dette navn."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Hændelse"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Første Besked er Modtaget"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Næste Besked Modtages i Fokus"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Næste Besked Modtages uden Fokus"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt er Tilsluttet"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt er ikke Tilsluttet"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Besked er Sendt"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Besked Modtaget"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "GMail E-post Modtaget"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6512,7 +6478,7 @@ msgstr ""
 "ikon forbliver på skærmen længe er det sandsynlig\n"
 "at beskeden gik tabt."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6520,223 +6486,219 @@ msgstr ""
 "Teksten under denne linje er hvad der er blevet sagt siden\n"
 "sidste gang du var opmærksom på denne gruppe samtale"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Afslut"
+msgstr "_Citat"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Læs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Slå dette op i Or_dbogen"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbogens URL mangler en \"%s\" og det må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web søge URL'en mangler en \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Søg på nettet efter det"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Åbn som et _Link"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "I går"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i dage siden"
+msgid_plural "%i days ago"
+msgstr[0] "I går"
+msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber ID er allerede i listen"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Den Jabber ID som de skrev er allerede i listen. Vælg en anden."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "Nøgle ID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Sæt Humørstemning"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Besked"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Status Besked"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Besked?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Dette navn er allerede i brug. Vil du overskrive denne status besked?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Gem som Forvalgt Status Besked"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Skriv et navn for denne status besked"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresse:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyld ind data for den kontakt som du vil tilføje kontoen med navnet %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyld ind data for den kontakt som du vil tilføje"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruger ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Bruger ID'en må ikke indeholde en resource."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke tilføje dig selv til kontaktvinduet."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakten er allerede i kontaktvinduet"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Denne kontakt er allered i dit kontaktvindue"
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Bruger ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabber klient"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Nuværende Programudviklere:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Tidligere Programudviklerer:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "TAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Sidst men ikke mindst, vil vi gerne takke alle pakke vedligeholdere."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6749,98 +6711,101 @@ msgstr ""
 "\n"
 "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Kælenavnet har ikke tilladte tegn."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Forespørgsel på abonnering for konto %(account)s fra %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Forespørgsel om abonnering fra %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i en gruppe samtale %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan kun deltage i en gruppe samtale hvis du er tilsluttet."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Deltag i Gruppe Samtale med kontoen %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Ugyldigt kontonavn"
+msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Vælg den konto som du vil slutte dig til rummet med"
+msgstr ""
+"Du må vælge en konto som du vil bruge til at tilslutte gruppe samtalen med."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kælenavn"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppe samtale Jabber ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet på en gruppe samtale."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan kun synkronisere dine kontakter når du er tilsluttet."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Denne konto er ikke tilsluttet til serveren"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan kun synkronisere med en konto hvis du er tilsluttet."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start en samtale med konto %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6849,301 +6814,328 @@ msgstr ""
 "en besked til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vær venligst sikker på at du er tilsluttet med \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke fortolke \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan kun ændre din adgangskode hvis du er tilsluttet."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Ugyldig adgangskode"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Du må indtaste en adgangskode."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Adgangskoderene i de to tekstindtastningsfelter må være identiske."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakt Loggede Ind"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Ny Besked"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Ny Enkel Besked"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Ny Privat Besked"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Filoverførsel Fejl"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Filoverførsel er Fuldført"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale Invitation"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakt Ændrede Status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Besked med konto %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Besked i konto %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Enkel Besked"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Modtaget %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, python-format
 msgid "Form %s"
 msgstr "Formular %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsol for %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Konsol"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Trist"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Ændre"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Fjern"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Jeg vil gerne tilføje dig til min kontakt liste."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%s</b> vil gerne at du <b>%s</b> nogle kontakter i dit kontaktvindue."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
-msgstr ""
+msgstr "Tilføj"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Gnaven"
+msgstr "Ændre"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Jabber ID:"
+msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Gruppe"
+msgstr "Grupper"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
+msgstr "%s foreslog mig at tilføje dig til min kontaktliste."
+
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Tilføj Kont_akt"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatlivs Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rækkefølge: %(order)s, handling: %(action)s, type: %(type)s, værdi: %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rækkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Tilføj en regel</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Ugyldig Listenavn"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må indtaste et navn for at skabe en privatlivs liste."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har inviteret dig til at deltage i en diskussion"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 "$Contact har inviteret dig til at deltage i en gruppe samtale %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Vil du acceptere denne invitation?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Vælg Lyd"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav Lyde"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Vælg Billede"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Billeder"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s bliver:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Tilføj Speciel Påmindelse for %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "når jeg er"
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7154,19 +7146,19 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng er: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verificeret denne kontakts identitet."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet er verificeret"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Verificer igen..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7176,19 +7168,19 @@ msgstr ""
 "beskeder eller sende dig beskeder, må du verificere deres identitet ved at "
 "trykke på knappen under."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet er IKKE verificeret"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Verificer..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Har du bekræftet den kontaktens identitet?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7203,23 +7195,23 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med den fjerne kontakt og verificeret KÆS?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøgle (%s) <b>passer ikke</b> til den angivne nøgle i Gajim."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøgle er tildelt denne kontakt. Derfor kan du ikke kryptere "
 "beskeder."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7228,7 +7220,7 @@ msgstr ""
 "nøgle</b>, så beskeder <b>kan ikke</b> krypteres. Brug din GPG klient til at "
 "ændre dette."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7236,6 +7228,25 @@ msgstr ""
 "GPG Nøgle er tildet til denne kontakt, og du stoler på denne nøgle, så "
 "beskeder vil blive krypteret."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Andre"
@@ -7245,24 +7256,24 @@ msgstr "Andre"
 msgid "Conference"
 msgstr "Konference"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Du kan kun gennemse tilgængelige tjenester hvis du er tilsluttet"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Opdag Tjenester med kontoen %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Opdag Tjenester"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Tjenesten findes ikke"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7270,294 +7281,264 @@ msgstr ""
 "Der er ikke nogen tjenester på den adresse som du indtastede, eller serveren "
 "gav intet svar. Kontroller adressen og prøv igen."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Det er ikke mulig at gennemse denne tjeneste"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne type tjeneste har ingen elementer som kan gennemses."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Ikke gyldigt server navn"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Gennemse %(address)s med konto %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Gennemse"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjeneste har ingen elementer som kan gennemses."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Kør Kommando"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Brugere"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Bogmærke er allerede sat"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Bogmærket er blevet tilføjet succesfuldt"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "De kan håndtere dine bogmærker via Handlings menuen i dit kontaktvindue."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Abonnerede"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Knude"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
-#: ../src/features_window.py:46
-#, fuzzy
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
-msgstr "SSL certifikat fejl"
+msgstr "SSL certifikat validering"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Et bibliotek brugt til at validere server certifikater for at sikre en "
 "sikker forbindelse."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Kræver python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverløs samtale med automatisk opdagede klienter i et lokalt netværk."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Kræver python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Kræver pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Kommandoer: %s"
+msgstr "Kommandolinje"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Et script til at kontrollere Gajim via kommandolinjen."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Kræver python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Egenskab ikke tilgængelig under Windows."
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "OpenPGP Nøgle Valg"
+msgstr "OpenPGP besked kryptering"
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
-msgstr "Krypter samtale beskeder med gpg nøgler."
+msgstr "Krypterer samtale beskeder med gpg nøgler."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Kræver gpg og python-GnuPGInterface."
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
-msgstr "network-manager"
+msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Automatisk opdagelse af netværksstatus."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Kræver gnome-network-manager og python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Sessions Håndtering"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sessionen bliver gemt ved logud og genoprettet ved logind."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Kræver python-gnome2."
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Adgangskode for at slutte sig til rummet"
+msgstr "Adgangskodekryptering"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Adgangskoder kan blive gemt sikkert og ikke bare i ren tekst."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Kræver gnome-keyring og python-gnome2-desktop."
+msgstr "Kræver gnome-keyring og python-gnome2-desktop, eller kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Evnen til at tilslutte til servere som bruger SRV poster."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Kræver dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Kræver nslookup for at bruge SRV poster."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Stavekontrol"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Stavekontrol af forfattede beskeder."
 
-#: ../src/features_window.py:80
-#, fuzzy
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
-msgstr "Kræver python-sexy."
+msgstr "Kræver libgtkspell."
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
-msgstr "Påmindelser"
+msgstr "Påmindelse"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Passive pop op vinduer som påminder om nye hændelser."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 "Kræver python-notify eller python-dbus i forbindelse med påmindelses-dæmonen."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Statusikon"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Et ikon i statusfeltet som viser din nuværende tilstedeværelse."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Kræver python-gnome2-extras eller et kompileret statusikon modul fra Gajim "
-"kildekoden."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Kræver PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
-msgstr "_Tilpas til status"
+msgstr "Automatisk status"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Evnen til at måle tomgangs tid, for at kunne sætte automatisk status."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
-msgstr ""
+msgstr "Biblioteket libxss kræves"
 
-#: ../src/features_window.py:93
-#, fuzzy
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
-msgstr "Kræver python-gnome2."
+msgstr "Kræver python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Omdan LaTeX udtryk mellem $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7565,7 +7546,7 @@ msgstr ""
 "Kræver texlive-latex-base og dvipng. Du må sætte 'use_latex' til True i den "
 "avancerede konfigurations editor."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7573,25 +7554,23 @@ msgstr ""
 "Kræver texlive-latex-base og dvipng (begge findes i MikTeX). Du må sætte "
 "'use_latex' til True i den avancerede konfigurations editor."
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "Ende til Ende Kryptering"
+msgstr "Ende til Ende besked kryptering"
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Krypterer samtale beskeder."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Kræver python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7599,25 +7578,38 @@ msgstr ""
 "Generer XHTML uddata fra RST kode (se http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Kræver python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Bannere og klikbare links"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Muligheden for at have trykbare URL'er i samtale og gruppe samtale vindues "
 "bannere."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Kræver python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Kræver python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Egenskab"
 
@@ -7633,107 +7625,106 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Fremgang"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Afsender: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Modtager: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gemt i: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Filoverførsel er fuldført"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Filoverførsel er afbrudt"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Tilslutning til ligeværdige kan ikke oprettes."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Modtager: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Fejl besked: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
-msgstr "Filoverførsel Stoppede"
+msgstr "Filoverførsel stoppede"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Vælg en Fil at Sende..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan ikke tilgå denne fil"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Denne fil bliver brugt af en anden proces."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vil gerne sende dig en fil:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive den eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7741,33 +7732,33 @@ msgstr ""
 "En fil med dette navn eksisterer allerede og du har ikke rettigheder til at "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Denne fil eksisterer allerede"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Hvad vil du gøre?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Kataloget \"%s\" er ikke skrivbart"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheder til at oprette filer i dette katalog."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Gem Fil som..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7775,32 +7766,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig at sende tomme filer"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Afsender: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pause"
 
@@ -7811,27 +7802,23 @@ msgstr "Gajim behøver en X server for at kunne køre. Slutter..."
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "importering af PyGTK fejlede: %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim behøver PyGTK 2.8 eller højere"
+msgstr "Gajim behøver PyGTK 2.12 eller højere"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim behøver PyGTK 2.8 eller højere for at køre. Slutter..."
+msgstr "Gajim behøver PyGTK 2.12 eller højere for at køre. Slutter..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim behøver GTK 2.8 eller højere"
+msgstr "Gajim behøver GTK 2.12 eller højere"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim behøver GTK 2.8 eller højere for at køre. Slutter..."
+msgstr "Gajim behøver GTK 2.12 eller højere for at køre. Slutter..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7871,11 +7858,11 @@ msgstr ""
 "det fra %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim kører allerede"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7883,466 +7870,28 @@ msgstr ""
 "En anden instans af Gajim ser ud til at køre\n"
 "Kør alligevel?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Adgangskode Påkrævet"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Indtast adgangskoden til GPG nøglen %(keyid)s (Konto %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Ingen GPG nøgle valgt"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Forkert Adgangskode"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Indtast din GPG adgangskode igen eller annuller."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Dit ønskede kælenavn i gruppesamtalen %s er i brug eller registreret af en "
-"anden indehaver.\n"
-"Specificer venligst et andet kælenavn under:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Accepterer du denne forespørsel?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Accepterer du denne forespørgsel for konto %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) Autorisering for %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Tilslutning Fejlede"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Fejl %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "fejl opstod under sending %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Abonnement Forespørgsel"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorisering accepteret"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakten \"%s\" har godkendt dig til at se hans eller hendes status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Du vil altid se ham eller hende som offline.\n"
-"Vil du fjerne ham eller hende fra din kontakt liste?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Frameld abonnement"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt med \"%s\" kan ikke blive etableret"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s er nu kendt som %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s er nu %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s har sat emnet til %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "En ændring i en non-privacy-related rum konfiguration har forekommet"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Rum logging er nu aktiveret"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Rum logging er nu deaktiveret"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Rummet er nu ikke-anonymt"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Rummet er nu semi-anonymt"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Rummet er nu helt anonymt"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"En adgangskode er påkrævet for at deltage i rummet %s. Venligst skriv den."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Du har konfigureret Gajim til at bruge GPG agenten, men der er ingen GPG "
-"agent som kører eller den returnerede en forkert gpg-løsen.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Dit pgp-løsen er ikke korrekt"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Dit pgp-løsen er ikke korrekt"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG er ikke brugbar"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Ingen GPG nøgle er tildelt denne kontakt. Derfor kan du ikke kryptere "
-"beskeder."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Ikke spørg mig ige_n"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnomes Nøglering er installeret men ikke \t\t\t\t\t\t\t startet korrekt "
-"(miljøvariabel er sandsynligvis ikke \t\t\t\t\t\t\t sat op rigtig)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Ny e-post på %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Du har %d ny e-post samtale"
-msgstr[1] "Du har %d nye e-post samtaler"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Fra: %(from_address)s\n"
-"Emne: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s vil gerne sende dig en fil."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Fjerner kontakt fra kontaktvinduet"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Fejl ved læsning af fil:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Du har succesfuldt modtaget %(filename)s fra %(name)s"
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Du har succesfuldt sendt %(filename)s til %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Ikke i stand til at dekryptere beskeden fra %s\n"
-"Det er mulig den er blevet forfalsket."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Ikke i stand til at dekryptere beskeden"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Brugernavns Konflikt"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Skriv et nyt brugernavn for din lokale konto"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s .s)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Fejl."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Ressource Konflikt"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Du er allerede tilsluttet til denne konto med den samme ressource. Skriv "
-"venligst en ny"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Fejl under verificering af SSL certifikat"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Der var en fejl under verificeringen af SSL certifikatet fra din jabber "
-"server: %(error)s\n"
-"Vil du stadig prøve på at forbinde til denne server?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignorer denne fejl for dette certifikat."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "SSL certifikat fejl"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Det ser ud til at SSL certifikatet er blevet ændret eller din forbindelse er "
-"blevet kompromitteret\n"
-"Gammelt fingeraftryk: %(old)s\n"
-"Nyt fingeraftryk: %(new)s\n"
-"\n"
-"Vil du stadig forbinde og opdatere fingeraftrykket for certifikatet?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Ikke sikker forbindelse"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Du er ved at sende din adgangskode over en ikke krypteret forbindelse. Er du "
-"sikker på du vil gøre dette?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Du er ved at sende din adgangskode på en usikker forbindelse. Du bør "
-"installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
-"dette?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "PEP knude blev ikke fjernet"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP knude %(node)s blev ikke fjernet: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Følelsesikoner er ikke aktiveret"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
-"blevet deaktiveret."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Dit konfigurerede følelsesikon tema kan ikke findes. Du er måske nød til at "
-"opdatere formatet for filen emoticons.py. Se http://trac.gajim.org/wiki/"
-"Emoticons for flere detaljer."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Du kan ikke deltage i en gruppe samtale mens du er usynlig"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Kunne ikke gemme din opsætning og indstillinger"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Viser hjælp for en specifik kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "Kommando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "Vis hjælp for kommando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Viser eller gemmer kontaktvinduet"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Popper op et vindue ved næste hændelse"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8350,49 +7899,49 @@ msgstr ""
 "Udskriver en liste af alle kontakter i kontaktvinduet. Hver kontakt placeres "
 "på en separat linie"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "viser kun kontakter for den givne konto"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Udskriver en liste af registrerede kontoer"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Ændrer status for kontoen eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "besked"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status besked"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8401,49 +7950,44 @@ msgstr ""
 "status for alle kontoer der har sat \"synkroniser med generel status\" "
 "indstillingen"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Ændrer status for kontoen eller kontoer"
+msgstr "Ændrer prioriteringen for kontoen eller kontoer"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Priori_tet:"
+msgstr "prioritet"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Jeg vil _registrere en ny konto"
+msgstr "prioriteten du vil give til kontoen"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"Ændre status for konto \"konto\". Hvis ikke spesificeret, prøv at ændre "
-"status for alle kontoer der har sat \"synkroniser med generel status\" "
-"indstillingen"
+"ændre prioritet for en given konto. Hvis ikke specificeret, ændrer status "
+"for alle kontoer der har sat \"synkroniser med generel status\" indstillingen"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende beskeder til en kontakt"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Kontaktens JID som du vil samtale med"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "hvis specificeret vil kontakten tages fra kontaktlisten fra denne konto"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "besked indhold. Kontoen må specificeres eller \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8453,29 +7997,29 @@ msgstr ""
 "konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP nøgle', "
 "bare set 'OpenPGP nøgle' til ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID på den kontakt som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "besked indhold"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp nøgle"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hvis specificeret vil beskeden blive krypteret med denne nøgle"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "hvis specificeret vil beskeden blive sendt med denne konto"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8485,139 +8029,139 @@ msgstr ""
 "nøgle og konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP "
 "nøgle', bare set 'OpenPGP nøgle' til ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "emne"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "emne på besked"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Send en ny besked til en gruppesamtale du deltager i."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID på den rum som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Få detaljeret information om kontakten"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Kontaktens JID"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Få detaljeret information om kontoen"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Send en fil til en kontakt"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Filsti"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "hvis specificeret vil filen blive sendt med denne konto"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Hvis alle indstillinger og deres værdier"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sætter værdien for 'nøglen' til 'værdi'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "nøgle=værdi"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'nøgle' er navnet for indstillingen, 'værdi' er den værdi den er sat til"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Sletter et indstillingspunkt"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "nøgle"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "navn på den indstilling som skal slettes"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Skriver den nuværende tilstand af Gajims indstillinger til .config filen"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Tilføjer kontakt til kontaktvinduet"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Tilføjer ny kontakt til denne konto"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende status (den globale status hvis ikke en konto er "
 "valgt)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende statusbesked (den globale status besked hvis ikke en "
 "konto er valgt)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Returnerer antal ikke læste beskeder"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åbner 'Start Samtale' vinduet"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Starter en samtale med denne konto"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Sender tilpasset XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML som skal sendes"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8625,72 +8169,71 @@ msgstr ""
 "Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
 "blive sendt til alle kontoer"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndter en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI som skal håndteres"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Den konto som du vil håndtere det med"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "besked indhold"
+msgstr "Besked indhold"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Deltag i et MUC rum"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "Rum JID"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "kælenavn"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Kælenavn som skal bruges"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "adgangskode"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Adgangskode for at slutte sig til rummet"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Vælg den konto som du vil slutte dig til rummet med"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Kontroller om Gajim kører"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Viser eller gemmer ipython vinduet"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8699,15 +8242,15 @@ msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
 "Specificer venligst en konto for at sende beskeden."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ud til at Gajim ikke kører. Så du kan ikke bruge gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8716,16 +8259,16 @@ msgstr ""
 "Brug: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke fundet"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8734,7 +8277,7 @@ msgstr ""
 "Brug: %s kommando [argumenter]\n"
 "Kommando er en af:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8743,7 +8286,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8752,7 +8295,7 @@ msgstr ""
 "Argument \"%(arg)s\" er ikke specificeret. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Forkert uri"
 
@@ -8781,154 +8324,178 @@ msgstr "Du kan ikke slette det nuværende tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vælg venligst en anden for dit nuværende tema."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke længere i gruppe samtale \"%(room)s\" eller \"%(nick)s\" har "
 "forladt rummet."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Fortsat samtale"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Rum logging er aktiveret"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Et nyt rum er blevet oprettet"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har fastsat eller ændret dit kælenavn for rummet"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s er blevet udvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s er blevet udvist af %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blevet uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s er blevet uønsket af %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s er nu kendt som %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "tilknytning ændret"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "computeren slukkes"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s af %"
 "(actor)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s af %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s har forladt samtalen"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s er nu %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på du vil forlade gruppe samtalen \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Hvis du lukker dette vindue vil du blive frakoblet fra denne gruppe samtale."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Ikke spørg mig ige_n"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Ændre emne"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Anfør et nyt emne:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Ændre kælenavn"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Anfør dit nye kælenavn:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Fjern %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8936,22 +8503,22 @@ msgstr ""
 "Du er ved at definitivt fjerne dette rum.\n"
 "Du kan anføre en grund herunder:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparker %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Du kan anføre en begrundelse under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Udeluk %s"
@@ -8976,58 +8543,473 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fejl: kan ikke åbne %s for læsning"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Fejl ved læsning af fil:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Fejl ved fortolkning af fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Kunne ikke skrive til %s. Sessions håndterings understøttelse vil ikke virke"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber client"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Har du lyst til at gøre Gajim til standard Jabber client?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Altid kontroller om Gajim er standard Jabber client ved opstart"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Udvidelse er ikke understøttet"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Billede kan ikke gemmes i formatet %(type)s. Gem som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Gem Billede som..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Dit ønskede kælenavn i gruppesamtalen %s er i brug eller registreret af en "
+"anden indehaver.\n"
+"Specificer venligst et andet kælenavn under:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Altid brug dette kælenavn når der er en konflikt"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Accepterer du denne forespørsel?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Accepterer du denne forespørgsel for konto %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) Autorisering for %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Tilslutning Fejlede"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Fejl %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "fejl opstod under sending %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Abonnement forespørgsel"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorisering accepteret"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakten \"%s\" har godkendt dig til at se hans eller hendes status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Du vil altid se ham eller hende som offline.\n"
+"Vil du fjerne ham eller hende fra din kontakt liste?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Frameldt abonnement"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt med \"%s\" kan ikke blive etableret"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s har sat emnet til %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "En ændring i en non-privacy-related rum konfiguration har forekommet"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Rum logging er nu aktiveret"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Rum logging er nu deaktiveret"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Rummet er nu ikke-anonymt"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Rummet er nu semi-anonymt"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Rummet er nu helt anonymt"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
+"En adgangskode er påkrævet for at deltage i rummet %s. Venligst skriv den."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Du har konfigureret Gajim til at bruge GPG agenten, men der er ingen GPG "
+"agent som kører eller den returnerede en forkert gpg-løsen.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Dit pgp-løsen er ikke korrekt"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "OpenPGP-løsen er ikke korrekt"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG nøglen kan ikke stoles på"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"GPG nøglen brugt til at kryptere den samtale er ikke til at stole på. Vil du "
+"virkelig kryptere den besked?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnomes Nøglering er installeret men ikke \t\t\t\tstartet korrekt "
+"(miljøvariabel er sandsynligvis ikke \t\t\t\t\\sat op rigtig)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ny e-post på %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Du har %d ny e-post samtale"
+msgstr[1] "Du har %d nye e-post samtaler"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Fra: %(from_address)s\n"
+"Emne: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vil gerne sende dig en fil."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Den fjerne kontakt stoppede filoverførslen"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Fejl ved åbning af fil"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Du har succesfuldt modtaget %(filename)s fra %(name)s"
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Du har succesfuldt sendt %(filename)s til %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Ikke i stand til at dekryptere beskeden fra %s\n"
+"Det er mulig den er blevet forfalsket."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Ikke i stand til at dekryptere beskeden"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Brugernavns Konflikt"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Skriv et nyt brugernavn for din lokale konto"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s .s)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Fejl."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Ressource Konflikt"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Du er allerede tilsluttet til denne konto med den samme ressource. Skriv "
+"venligst en ny"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s vil gerne sende dig en fil."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Filoverførsel Forespørgsel"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Fejl under verificering af SSL certifikat"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Der var en fejl under verificeringen af SSL certifikatet fra din jabber "
+"server: %(error)s\n"
+"Vil du stadig prøve på at forbinde til denne server?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignorer denne fejl for dette certifikat."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "SSL certifikat fejl"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Det ser ud til at SSL certifikatet for kontoen %(account)s er blevet ændret "
+"eller din forbindelse er blevet kompromitteret\n"
+"Gammelt fingeraftryk: %(old)s\n"
+"Nyt fingeraftryk: %(new)s\n"
+"\n"
+"Vil du stadig forbinde og opdatere fingeraftrykket for certifikatet?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Ikke sikker forbindelse"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Du er ved at sende din adgangskode over en ikke krypteret forbindelse. Er du "
+"sikker på du vil gøre dette?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Du er ved at sende din adgangskode på en usikker forbindelse. Du bør "
+"installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
+"dette?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP knude blev ikke fjernet"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP knude %(node)s blev ikke fjernet: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Følelsesikoner er ikke aktiveret"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
+"blevet deaktiveret."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Dit konfigurerede følelsesikon tema kan ikke findes. Du er måske nød til at "
+"opdatere formatet for filen emoticons.py. Se http://trac.gajim.org/wiki/"
+"Emoticons for flere detaljer."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Du kan ikke deltage i en gruppe samtale mens du er usynlig"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Kunne ikke gemme din opsætning og indstillinger"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Adgangskode Påkrævet"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Indtast adgangskoden til GPG nøglen %(keyid)s (Konto %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "GPG nøgle er udløbet"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Din GPG nøgle er udløbet, du vil blive tilsuttet til %s uden OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Forkert Adgangskode"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Indtast din GPG adgangskode igen eller annuller."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
 
@@ -9042,7 +9024,7 @@ msgstr "Kontakter"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Dato"
 
@@ -9053,7 +9035,7 @@ msgstr "Kælenavn"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Besked"
 
@@ -9078,192 +9060,188 @@ msgstr ""
 "\n"
 "I tilfælde du trykker JA, venligst vent..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Eksporter Historik Log..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s klokken %(time)s sagde: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Vil du virkelig slette loggen for den valgte kontakt?"
 msgstr[1] "Vil du virkelig slette loggene fra de valgte kontakter?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Dette er en irreversibel handling."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vil du virkelig slette den valgte besked?"
 msgstr[1] "Vil du virkelig slette de valgte beskeder?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversations Historik med %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Disk Skrivefejl"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Fejl besked: %s"
+msgstr "Fejl: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Fejl."
+msgstr "Fejl"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nu: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Tidsudløb nået for at laste billede"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Billede er for stort"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Du er ikke tilsluttet til serveren"
+msgstr "Du er ved at lukke flere faneblade"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Vil du virkelig slette den valgte besked?"
+msgstr "Vil du virkelig lukke dem alle?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Beskeder"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- beskeder vil blive logget"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- beskeder vil ikke blive logget"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Ændrede Status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Loggede Ind"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Loggede Ud"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Besked fra gruppe samtale %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Besked fra %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:568
 msgid "Ignore"
-msgstr "_Ignorer"
+msgstr "Ignorer"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Information modtaget"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uden en tilslutning kan du ikke publicere din kontakt information."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Information er IKKE publiceret"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "vCard publicering fejlede"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9271,48 +9249,53 @@ msgstr ""
 "Der var en fejl under publicering af din personlige information, prøv igen "
 "senere."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Flettede kontoer"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu vil %s vide din status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Hvis %s accepterer denne forespørsel vil du kunne se hans eller hendes "
 "status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG er ikke brugbar"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Du deltager i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9320,28 +9303,27 @@ msgstr ""
 "Hvis du ændrer din status til usynlig vil det resultere i at du bliver "
 "frakoblet fra disse gruppesamtaler. Er du sikker på du vil gøre dig usynlig?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "ikke synkroniseret"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Skal Gajim afsluttes?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Er du sikker på du vil forlade gruppe samtalen \"%s\"?"
+msgstr "Er du sikker på du vil afslutte Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Altid afslut Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Du har ulæste beskeder"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9349,16 +9331,16 @@ msgstr ""
 "Beskeder vil kun være tilgængelige for læsning senere hvis du har historik "
 "aktiveret og kontakten er i dit kontaktvindue."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Du må læse dem før du fjerner denne transport."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil blive fjernet"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9366,11 +9348,11 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger denne transport."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transporter vil blive fjernet"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9379,68 +9361,69 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger disse transporter: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
-msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
+msgstr "Du er ved at blokere en kontakt. Er du sikker på du vil fortsætte?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Denne kontakt vil se dig offline og du vil ikke modtage beskeder han sender "
+"dig."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Omdøb Kontakt"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Omdøb Gruppe"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Fjern Gruppen"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vil du fjerne gruppen %s fra kontaktvinduet?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Fjern også alle kontakter i denne gruppe fra kontaktvinduet"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Tildel OpenPGP Nøgle"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Vælg den nøgle du vil anvende til kontakten"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt %s vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
-msgstr ""
+msgstr "Du er ved at fjerne \"%(name)s\" (%(jid)s) fra dit kontaktvindue.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9449,11 +9432,11 @@ msgstr ""
 "vil altid se dig som offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9461,16 +9444,16 @@ msgstr ""
 "Ved at fjerne denne kontakt fjerner du også samtidig godkendelsen, så han "
 "eller hun altid vil se dig som offline."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Jeg vil at denne kontakt kan se min status efter den er blevet fjernet"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9480,33 +9463,35 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
-msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
+msgstr ""
+"Du er ved at sende en personlig status. Er du sikker på du vil fortsætte?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Denne kontakt vil midlertidig se dig som %(status)s, men kun indtil du "
+"ændrer din status. Da vil han se din globale status."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Du må oprette en konto før du kan begynde en samtale med andre kontakter."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9515,12 +9500,12 @@ msgstr ""
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9529,183 +9514,182 @@ msgstr ""
 "Metakontakter er en måde at gruppere flere kontakter på en linie. Oftest "
 "bruges det når den samme person har flere Jabber eller transport kontoer."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vil du sende denne fil til %s:"
 msgstr[1] "Vil du sende disse filer til %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Send %s"
+msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4213
-#, fuzzy, python-format
+#: ../src/roster_window.py:4233
+#, python-format
 msgid "Make %s and %s metacontacts"
-msgstr "Send en fil til en kontakt"
+msgstr "Lav %s og %s til metakontakter"
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "med konto %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "til %s konto"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "bruger %s konto"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "Håndter Bog_mærker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "fra konto %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Tilpas Tjenester..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Håndter Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Ændre _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Send Enkel Besked"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Kør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "Hå_ndter Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Omdøb"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "Afbry_d tilslutningen"
+msgstr "_Tilslut igen"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "Afbry_d tilslutningen"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Historik Håndterer"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Deltag i Ny Gruppe Samtale"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Ændre Status Besked..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Venter på resultater"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Fejl i modtaget dataform"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Intet resultat"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Disk SkriveFejl"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Bekræft disse sessions indstillinger"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9720,7 +9704,7 @@ msgstr ""
 "\n"
 "\tKan disse indstillinger godkendes?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9735,116 +9719,116 @@ msgstr ""
 "\n"
 "Fortsæt med sessionen?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Ændre Status Besked..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s af denne gruppe samtale"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [blokeret]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [minimeret]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Sidste status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Tilslutning afbrudt"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Abonnering: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Melodi:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Hent"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Send"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Fuldført"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Midlertidig stoppet"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Hænger"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjeneste har endnu ikke svaret med detaljeret information"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9852,29 +9836,28 @@ msgstr ""
 "Denne tjeneste kunne ikke svare med detaljeret information.\n"
 "Den er højst sandsynlig ikke fungerende"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Client:Ukendt"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Ukendt"
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
-msgstr "?Client:Ukendt"
+msgstr "?Tid:Ukendt"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilknytning:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9882,7 +9865,7 @@ msgstr ""
 "Denne kontakt er interesseret i din tilstedeværelses information, men du er "
 "ikke interesseret i hans/hendes tilstedeværelse"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9890,14 +9873,14 @@ msgstr ""
 "Du er interesseret i kontaktens tilstedeværelses information, men han/hun er "
 "ikke interesseret i din"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er begge interessered i hinandens tilstedeværelses "
 "information"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9905,233 +9888,68 @@ msgstr ""
 "Du er ikke interesseret i kontaktens tilstedeværelse, og han/hun er ikke "
 "interesseret i din"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar om din abonnements forespørsel"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
-#~ msgid "Add Special _Notification"
-#~ msgstr "Tilføj Speciel _Påmindelse"
-
-#~ msgid "Assign Open_PGP Key"
-#~ msgstr "Tilskriv Open_PGP Nøgle"
-
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Kommando er ikke understøttet for zeroconf konto."
-
-#~ msgid "Commands: %s"
-#~ msgstr "Kommandoer: %s"
-
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Brug: /%s, rydder tekst vinduet"
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Brug: /%s, gem samtale knapper"
-
-#~ msgid ""
-#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
-#~ "third person. (e.g. /%(command)s explodes.)"
-#~ msgstr ""
-#~ "Brug: /%(command)s <handling>, sender handling til den nuværende gruppe "
-#~ "samtale. Brug tredie person. (f.eks. /%(command)s eksploderer.)"
-
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Brug: %s, sender en ping til kontakten"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Brug: /%s, send beskeden til kontakten"
-
-#~ msgid "No help info for /%s"
-#~ msgstr "Ingen hjælp for /%s"
+#~ msgid "_Incoming message:"
+#~ msgstr "_Indkommende besked:"
 
-#~ msgid "Enable link-local/zeroconf messaging"
-#~ msgstr "Aktiver link-local/zeroconf beskeder"
-
-#~ msgid "Nickname not found: %s"
-#~ msgstr "Kælenavn ikke fundet: %s"
-
-#~ msgid "This group chat has no subject"
-#~ msgstr "Denne gruppe samtale har ikke noget emne"
-
-#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
-#~ msgstr "Inviterede %(contact_jid)s til %(room_jid)s."
-
-#, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Kælenavn ikke fundet: %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
-#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
-#~ msgstr ""
-#~ "Brug: /%s <kælenavn|JID> [begrundelse], udviser denne JID fra gruppe "
-#~ "samtalen. Kælenavnet til en bruger kan bruges, men ikke hvis det "
-#~ "indeholder \"@\". Hvis en bruger med JID'en er tilstede i gruppe samtalen "
-#~ "vil han/hun/den/det også blive udvist. Mellemrum i kælenavnet er ikke "
-#~ "understøttet."
-
-#~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Brug: /%s <kælenavn>, åbner et privat samtale vindue med den "
-#~ "specificerede bruger."
-
-#~ msgid ""
-#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
-#~ "if specified."
-#~ msgstr ""
-#~ "Brug: /%s [begrundelse], lukker det nuværende vindue eller fan, visende "
-#~ "begrundelsen hvis specificeret."
-
-#~ msgid ""
-#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
-#~ "optionally providing a reason."
-#~ msgstr ""
-#~ "Brug: /%s <JID> [begrundelse], inviter JID til den nuværende gruppe "
-#~ "samtale, visende begrundelsen hvis specificeret"
-
-#~ msgid ""
-#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
-#~ "optionally using specified nickname."
-#~ msgstr ""
-#~ "Brug: /%s <rum>@<server>[/kælenavn], tilbyder at deltage i rum@server "
-#~ "eventuelt med det specificerede kælenavn."
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
-#~ "nickname from the group chat and optionally displays a reason."
-#~ msgstr ""
-#~ "Brug: /%s <kælenavn> [begrundelse], fjerner deltager med kælenavnet fra "
-#~ "gruppe samtalen og hvis specificeret, viser en begrundelse"
-
-#~ msgid ""
-#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
-#~ "message to the occupant specified by nickname."
-#~ msgstr ""
-#~ "Brug: /%s <kælenavn> [besked], åbner et privat samtale vindue og sender "
-#~ "beskeden til deltageren med det specificerede kælenavn."
-
-#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-#~ msgstr ""
-#~ "Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
-
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Brug: /%s , viser navnene på deltagerne i gruppe samtalen."
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Udgående besked:"
 
 #~ msgid ""
-#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
 #~ msgstr ""
-#~ "Brug: /%s [emne], viser eller opdaterer det nuværende gruppe samtale emne."
+#~ "Værten %s du konfigurerte i ft_add_hosts_to_send avancerte indstillinger "
+#~ "er ikke gyldig, så den bliver ignoreret."
 
-#~ msgid ""
-#~ "Usage: /%s <message>, sends a message without looking for other commands."
-#~ msgstr ""
-#~ "Brug: /%s <besked>, sender en besked uden at kigge efter andre kommandoer."
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP adgangskode blev ikke givet"
 
-#, fuzzy
 #~ msgid ""
-#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-#~ "messages."
+#~ "To continue sending and receiving messages, you will need to reconnect."
 #~ msgstr ""
-#~ "Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
-
-#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-#~ msgstr ""
-#~ "Tryk for at se egenskaber (som MSN, ICQ transporter) på jabber serveren"
-
-#~ msgid "Servers Features"
-#~ msgstr "Server Egenskaber"
-
-#~ msgid "Your JID:"
-#~ msgstr "Din JID:"
-
-#~ msgid "Name:"
-#~ msgstr "Navn:"
-
-#~ msgid "_Host:"
-#~ msgstr "_Værtsmaskine:"
-
-#~ msgid "Show _roster"
-#~ msgstr "Vis _kontaktvindue"
-
-#~ msgid "Select the account with which to synchronise"
-#~ msgstr "Vælg den konto som du vil synkronisere med"
-
-#~ msgid "Modify Account"
-#~ msgstr "Ændre Konto"
+#~ "For at kunne fortsætte med at sende og modtage beskeder, må du tilslutte "
+#~ "dig igen."
 
 #~ msgid ""
-#~ "%(title)s by %(artist)s\n"
-#~ "from %(source)s"
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
 #~ msgstr ""
-#~ "%(title)s af %(artist)s\n"
-#~ "fra %(source)s"
-
-#~ msgid "Gajim account %s"
-#~ msgstr "Gajim konto %s"
-
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Altid brug OS/X standard programmer"
-
-#~ msgid "Custom"
-#~ msgstr "Tilpasset"
-
-#~ msgid "Duplicate Jabber ID"
-#~ msgstr "Jabber ID eksisterer"
-
-#~ msgid "This account is already configured in Gajim."
-#~ msgstr "Denne konto er allerede konfigureret i Gajim."
+#~ "Du er ikke tilsluttet eller synlig for andre. Din besked kunne ikke "
+#~ "sendes."
 
-#~ msgid "PyOpenSSL"
-#~ msgstr "PyOpenSSL"
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Denne besked er krypteret]"
 
-#~ msgid "gajim-remote"
-#~ msgstr "gajim-fjernstyring"
+#~ msgid "%i days ago"
+#~ msgstr "%i dage siden"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
+#~ msgid "Trayicon"
+#~ msgstr "Statusikon"
 
-#~ msgid "gnome-keyring"
-#~ msgstr "gnome-nøglering"
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Et ikon i statusfeltet som viser din nuværende tilstedeværelse."
 
 #~ msgid ""
-#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
-#~ "Gajim sources."
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
 #~ msgstr ""
-#~ "Kræver python-gnome2-extras eller kompilering af gtkspell modulet fra "
+#~ "Kræver python-gnome2-extras eller et kompileret statusikon modul fra "
 #~ "Gajim kildekoden."
 
-#~ msgid "Notification-daemon"
-#~ msgstr "Påmindelses-dæmon"
-
-#~ msgid "Idle"
-#~ msgstr "Tomgang"
-
-#~ msgid "Requires compilation of the idle module from Gajim sources."
-#~ msgstr "Kræver kompilering af tomgangs modulet fra Gajim kildekoden."
-
-#~ msgid "libsexy"
-#~ msgstr "libsexy"
-
-#~ msgid "File transfer stopped by the contact at the other end"
-#~ msgstr "Filoverførslen blev stoppet af kontakten i den anden ende"
-
-#~ msgid "Generic"
-#~ msgstr "Fællesbetegnelse"
-
-#~ msgid "Mood"
-#~ msgstr "Humør"
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Kræver PyGTK >= 2.10."
 
-#~ msgid "Activity"
-#~ msgstr "Aktivitet"
+#~ msgid "gtk-ok"
+#~ msgstr "ok"
diff --git a/po/de.po b/po/de.po
index 6a5d40c83..7a10ed705 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,10 +9,10 @@
 # Niklas Hambüchen <nh2@deditus.de>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gajim 0.12\n"
+"Project-Id-Version: gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-19 23:38+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-12-13 23:46+0100\n"
 "Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgstr "<b>Bitte einen Server wählen</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -108,9 +108,8 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Authentifizierung _verwenden"
+msgstr "Anon_yme Authentifizierung"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -246,16 +245,8 @@ 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 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."
+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:14
@@ -270,8 +261,7 @@ msgstr "Klicken, um das Konto-Passwort zu ändern."
 #: ../data/glade/account_modification_window.glade.h:13
 #: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Klicken, um alle Kontakte eines anderen Kontos um Autorisierung 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:18
@@ -285,9 +275,13 @@ msgstr "Persönliche Informationen bearbeiten …"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5
+#: ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112
+#: ../src/notify.py:560
+#: ../src/notify.py:581
+#: ../src/notify.py:620
+#: ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -296,9 +290,12 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52
+#: ../src/common/contacts.py:135
+#: ../src/dialogs.py:111
+#: ../src/dialogs.py:121
+#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Allgemein"
 
@@ -308,50 +305,27 @@ 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, sendet Gajim von mehreren anstatt von nur Ihrer eigenen IP-"
-"Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen Dateiübertragung "
-"erhöht wird."
+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."
+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
-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
-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."
+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
-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."
+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
@@ -359,21 +333,32 @@ msgid "Information about you, as stored in the server"
 msgstr "Informationen über Sie, die auf dem Server gespeichert sind"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35
+#: ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Kein Schlüssel ausgewählt"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3
+#: ../src/config.py:1158
+#: ../src/config.py:1261
+#: ../src/config.py:1550
+#: ../src/config.py:1555
+#: ../src/config.py:2103
+#: ../src/config.py:2182
+#: ../src/config.py:2195
+#: ../src/config.py:3396
+#: ../src/config.py:3469
+#: ../src/dialogs.py:308
+#: ../src/dialogs.py:310
+#: ../src/dialogs.py:513
+#: ../src/dialogs.py:526
+#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Kein Proxy"
 
@@ -394,20 +379,13 @@ msgstr "Priori_tät:"
 
 #: ../data/glade/account_modification_window.glade.h:33
 #: ../data/glade/accounts_window.glade.h:40
-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."
+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:41
 msgid "Priority will change automatically according to your status."
-msgstr ""
-"Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
+msgstr "Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
 
 #: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
@@ -420,18 +398,8 @@ msgstr "Ressour_ce:"
 
 #: ../data/glade/account_modification_window.glade.h:37
 #: ../data/glade/accounts_window.glade.h:44
-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."
+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
 msgid "Save _passphrase (insecure)"
@@ -488,17 +456,12 @@ msgid "Accounts"
 msgstr "Konten"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Authentifizierung _verwenden"
+msgstr "Anonyme Authentifizierung"
 
 #: ../data/glade/accounts_window.glade.h:13
-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."
+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:17
 msgid "Co_nnect on Gajim startup"
@@ -517,24 +480,20 @@ msgstr "Vorname:"
 # TODO: GPG/PGP unification in original strings needed
 #: ../data/glade/accounts_window.glade.h:24
 msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie "
-"seahorse."
+msgstr "Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie seahorse."
 
 #: ../data/glade/accounts_window.glade.h:29
 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"
+"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/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -548,7 +507,8 @@ msgid "Mer_ge accounts"
 msgstr "Konten _zusammenführen"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42
+#: ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "_Umbenennen"
 
@@ -628,7 +588,7 @@ msgstr "Neuen Kontakt hinzufügen"
 
 #: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
-msgstr "Ich würde Dich gerne zu meiner Kontaktliste hinzufügen."
+msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen."
 
 #: ../data/glade/add_new_contact_window.glade.h:5
 msgid ""
@@ -713,9 +673,7 @@ msgstr "<b>Beschreibung</b>"
 
 #: ../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"
@@ -739,8 +697,7 @@ 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 alle momentan angemeldeten 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..."
@@ -800,7 +757,8 @@ msgid "All statuses"
 msgstr "Alle Status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../src/common/commands.py:101
+#: ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Abwesend"
 
@@ -867,11 +825,8 @@ msgid "When "
 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"
@@ -947,7 +902,8 @@ msgstr "Zuletzt geändert:"
 msgid "New entry received"
 msgstr "Neuer Eintrag empfangen"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5
+#: ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Sie haben einen neuen Eintrag erhalten:"
 
@@ -991,11 +947,13 @@ msgstr "Neues Passwort eingeben:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Geben Sie Ihre neue Statusnachricht ein</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Aktivität:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Stimmung:"
 
@@ -1076,9 +1034,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Open_PGP-Schlüssel zuweisen …"
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Befehl ausführen …"
+msgstr "B_efehl ausführen …"
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1086,8 +1043,9 @@ msgstr "_Gruppen bearbeiten …"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
@@ -1100,8 +1058,9 @@ msgid "Remo_ve"
 msgstr "Ent_fernen"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9
+#: ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Benu_tzerdefinierten Status senden"
 
@@ -1135,8 +1094,10 @@ msgid "_Allow him/her to see my status"
 msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370
+#: ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Blockieren"
 
@@ -1147,7 +1108,8 @@ msgstr "_Verbiete dem Kontakt, meinen Status zu sehen"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21
+#: ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Verlauf"
 
@@ -1169,8 +1131,10 @@ msgstr "_Abonnement"
 
 # TODO: Review by german translators
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13
+#: ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364
+#: ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Entblocken"
 
@@ -1220,9 +1184,7 @@ 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 die unvollständige "
-"Datei."
+msgstr "Bricht die ausgewählte Dateiübertragung ab und löscht die unvollständige Datei."
 
 #: ../data/glade/filetransfers.glade.h:5
 msgid "Clean _up"
@@ -1242,28 +1204,22 @@ 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 aus "
-"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."
 
 #: ../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 aus der Liste. Falls die "
-"Übertragung aktiv ist, wird sie erst gestoppt und anschließend 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:820
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -1271,7 +1227,8 @@ msgstr "_Fortsetzen"
 msgid "_Notify me when a file transfer is complete"
 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:204
 msgid "_Open Containing Folder"
 msgstr "Öffne _Ordner"
 
@@ -1299,7 +1256,8 @@ msgstr ""
 "Kontakt-Reihe\n"
 "Chat-Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Fett"
 
@@ -1319,11 +1277,13 @@ msgstr "Gajim-Design-Einstellungen"
 msgid "Gone"
 msgstr "Weg"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1371,7 +1331,8 @@ msgstr "_Thema ändern …"
 msgid "Configure _Room..."
 msgstr "Chat_raum einrichten …"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "Chatraum zu den Lesezeichen _hinzufügen"
 
@@ -1435,12 +1396,14 @@ msgstr "_Stimme verleihen"
 msgid "Create new post"
 msgstr "Neue Nachricht"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/glade/groups_post_window.glade.h:2
+#: ../src/common/helpers.py:244
 msgid "From"
 msgstr "Von"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../data/glade/groups_post_window.glade.h:3
+#: ../src/history_manager.py:195
 #: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Thema"
@@ -1448,20 +1411,19 @@ 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 möchten, beenden Sie Gajim vorher. 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 im Gajim-Verlaufsmanager</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4
+#: ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1475,24 +1437,20 @@ 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 links Logeinträge auswählen und 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 "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:323
 msgid "Conversation History"
 msgstr "Unterhaltungsverlauf"
 
@@ -1517,11 +1475,11 @@ msgstr "Unterhaltungsver_lauf"
 
 # TODO: Synchronize with other strings concerning bookmarks
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "Diesen Chatraum speichern (Strg+B)"
+msgstr "Diesen Chatraum merken (Strg+B)"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Chatraum betreten"
 
@@ -1548,8 +1506,9 @@ msgstr "Kürzlich:"
 msgid "Room:"
 msgstr "Chatraum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9
+#: ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Betreten"
 
@@ -1577,7 +1536,8 @@ msgstr "Minimieren bei automatischem Beitritt"
 msgid "Print status:"
 msgstr "Status anzeigen:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1689,17 +1649,25 @@ msgid "Show a list of formattings"
 msgstr "Schriftformatierung (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr "Liste erweiterter Funktionen anzeigen (Alt+A)"
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Liste erweiterter Funktionen anzeigen (Alt+D)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Benutzerprofil anzeigen (Strg+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr "Zwischen Audio-Sitzung umschalten"
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr "Zwischen Video-Sitzung umschalten"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Senden"
 
@@ -1792,9 +1760,7 @@ 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 "Allow sound when I'm _busy"
@@ -1815,7 +1781,7 @@ msgstr ""
 "Bei jedem Programmstart automatisch erkennen\n"
 "Immer die GNOME-Standard-Anwendungen verwenden\n"
 "Immer die KDE-Standard-Anwendungen verwenden\n"
-"Immer die XFCE4-Standard-Anwendungen verwenden\n"
+"Immer die Xfce-Standard-Anwendungen verwenden\n"
 "Benutzerdefiniert"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1831,6 +1797,14 @@ msgid "Configure color and font of the interface"
 msgstr "Farben und Schriftarten für die Oberfläche konfigurieren"
 
 #: ../data/glade/preferences_window.glade.h:36
+msgid "Contact's message:"
+msgstr "Nachricht des Kontakts:"
+
+#: ../data/glade/preferences_window.glade.h:37
+msgid "Contact's nickname:"
+msgstr "Spitzname des Kontakts:"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1844,208 +1818,123 @@ msgstr ""
 "separate Kontaktliste gruppiert nach Benutzerkonto\n"
 "separate Kontaktliste gruppiert nach Typ"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "_Aktivitäten von Kontakten in der Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Zusätzliche _E-Mail-Details anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Die gerade abgespielten Musik_titel anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "A_vatare der Kontakte in der Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "_Stimmungen anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Status_nachrichten anzeigen"
 
-#: ../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 "
-"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 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: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."
+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:51
-msgid "Hide all buttons in chat windows"
-msgstr "Versteckt alle Schaltflächen im Chatfenster"
+#: ../data/glade/preferences_window.glade.h:50
+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:52
-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:51
+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:53
-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."
+msgid "Hide all buttons in chat windows"
+msgstr "Versteckt alle Schaltflächen im Chatfenster"
 
 #: ../data/glade/preferences_window.glade.h:54
-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."
+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:55
-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."
+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:56
-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."
+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:57
-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."
+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:58
-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."
+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:59
-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."
+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:60
-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."
+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:61
-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."
+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:62
-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."
+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:63
-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."
+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:64
-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."
+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:65
-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.)"
+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:66
-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."
+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:67
-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."
+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:68
+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:69
+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:70
 msgid "Log _encrypted chat session"
 msgstr "V_erschlüsselte Sitzungen aufzeichnen"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Nachrichtenfenster _kompakt anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Verwalte_n …"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
@@ -2055,31 +1944,31 @@ msgstr ""
 "Nur bei neuen Ereignissen\n"
 "Immer"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Benachr_ichtigen, wenn sich ein Kontakt anmeldet"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Bei neuen E-Mails bei _Google-Mail benachrichtigen"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Persönliche Ereignisse"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Klänge ab_spielen"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2089,177 +1978,160 @@ msgstr ""
 "Benachrichtigung anzeigen\n"
 "Nur in der Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Einstellungen"
 
 # 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
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
 msgstr "Symbol in der Systemleiste anzeigen:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../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:89
+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:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91
+#: ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Status-S_ymbole:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "D_esign:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
-"The auto away status message. If empty, Gajim will not change the current "
-"status message\n"
+"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."
+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:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message\n"
+"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."
+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:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "_Transport-Symbole verwenden"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Benutze System-_Voreinstellung"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Wenn eine neue Nachricht empfangen wird:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+msgid "Your message:"
+msgstr "Deine Nachricht:"
+
+#: ../data/glade/preferences_window.glade.h:105
+msgid "Your nickname:"
+msgstr "Dein Spitzname:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "Automatisch _abwesend nach:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "Benachrichtigungen über _den Chatstatus anzeigen:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Dateimanager:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
-msgstr ""
-"Ereignisse von Kontakten, die nicht in der Kontaktliste sind, _ignorieren"
+msgstr "Ereignisse von Kontakten, die nicht in der Kontaktliste sind, _ignorieren"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "Formatierten Inhalt in ankommenden Nachrichten _ignorieren"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Eingehende Nachricht:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Logge die Statusveränderungen von Kontakten"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "E-_Mail-Programm:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "Automatisch _nicht verfügbar nach:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "Ö_ffnen …"
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Ausgehende Nachricht:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "Auf Standardfarben zu_rücksetzen"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "Benachrichtigungen über den Chatstatus _senden:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Statusnachricht:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "_URL hervorheben:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Fensterverhalten:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "in Chat_räumen"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "in der _Kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "Minuten"
 
@@ -2292,9 +2164,8 @@ msgid "All"
 msgstr "allen"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "Kontakten, die:"
+msgstr "Alle (Abonnement eingeschlossen)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2312,7 +2183,8 @@ msgstr "der Jabber-ID:"
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12
+#: ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Privatsphären-Liste"
 
@@ -2457,7 +2329,8 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Namenspräfix:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30
+#: ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
@@ -2517,34 +2390,33 @@ msgstr "Konto entfernen (in Gajim und auf dem _Server)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380
+#: ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Entfernen"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:1
-msgid ""
-"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
-"your roster."
-msgstr ""
+msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
+msgstr "<b>jemand@irgendwo.de</b> möchte Sie als Kontakt zu seiner Kontaktliste <b>hinzufügen</b>."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Nachrichtenkörper <gegenwärtig unbenutzt, so dass er standardmäßig versteckt wird>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Austausch der Kontaktlistenelemente"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-close"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2601,7 +2473,8 @@ msgstr "_Aktionen"
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18
+#: ../src/disco.py:1467
 msgid "_Edit"
 msgstr "Änd_ern"
 
@@ -2642,11 +2515,13 @@ msgid "_Add contact"
 msgstr "_Kontakt hinzufügen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4
+#: ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Informationen"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5
+#: ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Suche"
 
@@ -2666,10 +2541,6 @@ msgstr "Registrieren auf"
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2719,12 +2590,8 @@ msgid "Authorize contact so he or she can know when you're connected"
 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 Ihren Status nicht sehen "
-"kann"
+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"
@@ -2876,338 +2743,329 @@ msgstr "Ressource:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Bestätigung abbrechen"
 
-#: ../src/adhoc_commands.py:269
-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:296
+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:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328
+#: ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Der Dienst sendete unzureichende Daten."
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Der Dienst änderte die Sitzungskennung."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Der Dienst gab einen Fehler zurück."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktiviert"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Deaktiviert"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96
+#: ../src/chat_control.py:879
 msgid "Color"
 msgstr "Farbe"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Einstellungsname"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Wert"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Keine)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../src/atom_window.py:110
-#, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Sie haben einen neuen Eintrag erhalten:"
+#: ../src/atom_window.py:119
+#, python-format
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Sie haben neue Einträge erhalten (und %d werden nicht angezeigt):"
+msgstr[1] "Sie haben neue Einträge erhalten (und %d werden nicht angezeigt):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Englisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Weißrussisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretonisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Deutsch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Britisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Baskisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Französisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norwegisch (Bokmål)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brasilianisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Russsich"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovakisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Sprache für die Rechtschreibprüfung"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478
+#: ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479
+#: ../src/chat_control.py:671
 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:820
+#: ../src/chat_control.py:861
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 msgid "Clear formating"
 msgstr "Formatierung löschen"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Datei wirklich senden?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, 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 der Kontakt Ihre echte Jabber-ID "
-"kennen."
+msgstr "Wenn Sie eine Datei an %s senden, wird der Kontakt Ihre echte Jabber-ID kennen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411
+#: ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG-Verschlüsselung aktiviert"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436
+#: ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253
+#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060
+#: ../src/dialogs.py:1973
+#: ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610
+#: ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398
+#: ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578
+#: ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194
+#: ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Nicht in der Kontaktliste"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "Eine Liste der aktiven, fertigen und angehaltenen Dateiübertragungen"
+msgstr "Der Kontakt unterstützt keine Dateiübertragung."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr ""
+msgstr "Sie müssen die JID des Kontakts kennen, um ihm oder ihr eine Datei zu senden."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Unbekannter Künstler"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Unbekannter Titel"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Unbekannte Quelle"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-msgstr ""
-"<b>\"%(title)s\"</b> von <i>%(artist)s</i>\n"
-"aus <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
+msgstr "%(type)s Status: %(state)s, Grund: %(reason)s"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus dem Chatraum %(room_name)s"
 
 # TODO: GPG/PGP unification in original strings needed
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844
+#: ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1699
-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:1845
+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:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Sitzung WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Sitzung WIRD NICHT aufgezeichnet"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "ist"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "ist NICHT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "wird"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "wird NICHT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 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:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3216,74 +3074,66 @@ msgstr ""
 "%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
 "Ihre Chatsitzung %(logged)s mitgeschrieben."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Sitzungsaushandlung abgebrochen"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Diese Sitzung ist verschlüsselt"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr " und wird AUFGEZEICHNET"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr " und wird NICHT AUFGEZEICHNET"
 
-#: ../src/chat_control.py:1923
-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:2074
+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:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113
+#: ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Die folgende Nachricht wurde UNVERSCHLÜSSELT übertragen"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Die folgende Nachricht wurde verschlüsselt übertragen"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
 
-#: ../src/chat_control.py:2236
-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:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2389
+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:2542
+#: ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483
+#: ../src/common/connection.py:420
+#: ../src/gajim.py:154
+#: ../src/session.py:134
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, 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 gehen alle Verläufe verloren)."
+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:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
@@ -3292,23 +3142,26 @@ msgstr "%(name)s ist jetzt %(status)s"
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129
+#: ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s ist eine Datei, sollte aber ein Verzeichnis sein"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130
+#: ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148
+#: ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
@@ -3353,7 +3206,8 @@ msgstr "Statusbeschreibung:"
 msgid "The status has been changed."
 msgstr "Der Status hat sich verändert."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:176
+#: ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Verlasse Chaträume"
 
@@ -3371,10 +3225,13 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Wählen Sie die Chaträume, die Sie verlassen möchten"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205
+#: ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55
+#: ../src/roster_window.py:809
+#: ../src/roster_window.py:1580
+#: ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Gruppenchat"
 
@@ -3396,14 +3253,11 @@ msgstr "Klang abspielen, wenn der Benutzer beschäftigt ist"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr ""
-"Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
+msgstr "Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
-msgstr ""
-"Nur die Kontakte in der Kontaktliste anzeigen, die Verfügbar oder Frei zum "
-"Chatten sind."
+msgstr "Nur die Kontakte in der Kontaktliste anzeigen, die Verfügbar oder Frei zum Chatten sind."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3415,9 +3269,7 @@ msgstr "$S (Abwesend wegen Untätigkeit für mehr als $T Minuten)"
 
 #: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
-msgstr ""
-"$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die "
-"Abwesenheitszeit."
+msgstr "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Abwesenheitszeit."
 
 #: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
@@ -3429,73 +3281,64 @@ msgstr "$S (Nicht verfügbar wegen Untätigkeit seit mehr als $T Minuten)"
 
 #: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
-msgstr ""
-"$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-"
-"Verfügbar-Zeit."
+msgstr "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-Verfügbar-Zeit."
 
 # FIXME: Check English
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
-msgstr ""
-"Legt fest, wann das Systemleisten-Symbol angezeigt wird. Mögliche Werte: "
-"'never', 'on_event', 'always'."
+msgstr "Legt fest, wann das Systemleisten-Symbol angezeigt wird. Mögliche Werte: 'never', 'on_event', 'always'."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Ungültiger Benutzername"
+msgstr "Farbe des eingehenden Spitznamens."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Farbe des abgehenden Spitznamens."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Farbe des eingehenden Textes."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Farbe des abgehende Textes."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "Statusnachricht"
+msgstr "Farbe der Statusnachricht."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Ungültiger Benutzername"
+msgstr "Schriftart des eingehenden Spitznamens."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Spitzname ändern"
+msgstr "Schriftart des ausgehenden Spitznamens."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Schriftart des eingehenden Textes."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Schriftart des abgehenden Textes."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "Statusnachricht"
+msgstr "Schriftart der Statusnachricht"
 
 #: ../src/common/config.py:105
-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."
+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:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106
+#: ../src/common/config.py:482
+#: ../src/common/optparser.py:288
+#: ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499
+#: ../src/gui_interface.py:3251
 msgid "default"
 msgstr "Standard"
 
@@ -3514,64 +3357,32 @@ msgstr ""
 "'never' - Zeige nie die Zeit."
 
 #: ../src/common/config.py:114
-msgid ""
-"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-"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."
+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:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
 #: ../src/common/config.py:118
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Falls aktiviert, wird */_ nicht entfernt. So wird *abc* fett gedruckt, aber "
-"* * wird nicht entfernt."
+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:121
-msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
-msgstr ""
-"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.)"
+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:130
-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."
+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:131
-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."
+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:159
-msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr ""
-"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)."
+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:160
 msgid "Characters that are printed before the nickname in conversations"
@@ -3586,39 +3397,28 @@ msgid "Add * and [n] in roster title?"
 msgstr "Sollen * und [n] in den Titel der Kontaktleiste eingefügt werden?"
 
 #: ../src/common/config.py:166
-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."
+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:167
 msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
+msgstr "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
 
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
-msgstr ""
+msgstr "Wie viele zurückliegende Chatzeilen sollen beim Betreten eines Gruppenchats abgefragt werden?"
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr ""
+msgstr "Wie viele Minuten zurück soll das Logfile beim Betreten eines Gruppenchats abgefragt werden?"
 
 #: ../src/common/config.py:170
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
+msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
+msgstr "Wie viele Sekunden soll gewartet werden, bevor ein Gruppenchat wieder automatisch betreten wird, von dem Sie getrennt worden sind? Setze den Wert auf 0, um das automatische Betreten zu deaktivieren."
 
 #: ../src/common/config.py:172
-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)."
+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:174
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -3626,88 +3426,48 @@ msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
 #: ../src/common/config.py:177
 #, 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 Wort / die 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:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr ""
-"Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert "
-"werden."
+msgstr "Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert werden."
 
 #: ../src/common/config.py:181
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"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)."
+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:182
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Senden von Chatstatus-Benachrichtigungen. Kann auf \"all\", \"composing_only"
-"\" oder \"disabled\" gesetzt werden."
+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:183
-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."
+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:185
-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."
+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:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Chatraum-Tab oder -Fenster geschlossen wird."
 
 #: ../src/common/config.py:187
-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)."
+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:188
-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)."
+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:189
-msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
-"data (chat, private chat, groupchat that will not be minimized)"
-msgstr ""
+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 "Frage bevor ein Chatfenster mit mehreren Tabs geschlossen wird, wenn dadurch Daten verloren gehen würden (Chat, Privatchat, nicht minimierter Gruppenchat)"
 
 #: ../src/common/config.py:192
-msgid ""
-"Comma separated list of hosts that we send, in addition of local interfaces, "
-"for File Transfer in case of address translation/port forwarding."
-msgstr ""
-"Kommagetrennte Liste von vollständigen Hostnamen oder IP-Adressen, die bei "
-"Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Rechnernamen "
-"gesendet werden."
+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:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -3730,96 +3490,48 @@ msgid "Show close button in tab?"
 msgstr "Schließen-Schaltflächen in Tabs anzeigen?"
 
 #: ../src/common/config.py:205
-msgid ""
-"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
-"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
-"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."
+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:214
 msgid "Preview new messages in notification popup?"
 msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung anzeigen?"
 
 #: ../src/common/config.py:219
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Eine durch Semikola getrennte Liste von Worten, die in einem Chatraum "
-"hervorgehoben werden sollen."
+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:220
-msgid ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-msgstr ""
-"Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers "
-"geklickt wird. Diese Option funktioniert nur, wenn das 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:221
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"Falls aktiviert, wird beim Starten überprüft, ob Gajim der Standard-Jabber-"
-"Client ist."
+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:222
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"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."
+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:223
-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."
+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:228
 msgid "Define the position of the avatar in roster. Can be left or right"
-msgstr ""
-"Legt die Position des Avatars in der Kontaktliste fest. \"left\" (links) "
-"oder \"right\" (rechts) sind mögliche Optionen."
+msgstr "Legt die Position des Avatars in der Kontaktliste fest. \"left\" (links) oder \"right\" (rechts) sind mögliche Optionen."
 
 #: ../src/common/config.py:229
-msgid ""
-"If True, Gajim will ask for avatar each contact that did not have an avatar "
-"last time or has one cached that is too old."
-msgstr ""
-"Falls aktiviert, wird jeder Kontakt, der beim letzten Mal keinen Avatar "
-"hatte oder dessen gespeicherter Avatar zu alt ist, nach einem neuen gefragt."
+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:230
-msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes his or her status and/or his or her status message."
-msgstr ""
-"Falls deaktiviert, wird keine Statuszeile im Chat angezeigt, wenn ein "
-"Kontakt seinen Status 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:231
-msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
-"longer print status line in groupchats when a member changes his or her "
-"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."
+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:233
 msgid "Background color of contacts when they just signed in."
@@ -3830,11 +3542,8 @@ msgid "Background color of contacts when they just signed out."
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade abgemeldet haben."
 
 #: ../src/common/config.py:236
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
-"Falls aktiviert, werden wiederhergestellte Nachrichten mit einer etwas "
-"kleineren Schrift als normal dargestellt."
+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:237
 msgid "Don't show avatar for the transport itself."
@@ -3845,52 +3554,33 @@ msgid "Don't show roster in the system taskbar."
 msgstr "Kontaktliste nicht in der Taskleiste anzeigen."
 
 #: ../src/common/config.py:239
-msgid ""
-"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
-"window flash (the default behaviour in most Window Managers) when holding "
-"pending events."
-msgstr ""
-"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)."
+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:241
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"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."
+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:244
 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 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"
+"'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."
+"'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:245
 msgid "If False, you will no longer see the avatar in the chat window."
-msgstr ""
-"Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
+msgstr "Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
 
 #: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
@@ -3913,222 +3603,125 @@ msgid "Hides the group chat occupants list in group chat window."
 msgstr "Versteckt die Benutzerliste im Chatraum-Fenster."
 
 #: ../src/common/config.py:251
-msgid ""
-"In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
-msgstr ""
-"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."
+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:252
 msgid "Indentation when using merge consecutive nickname."
-msgstr ""
-"Einrückung einfügen, 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:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Sanften Bildlauf im Unterhaltungsfenster verwenden"
 
 #: ../src/common/config.py:254
-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 \":\")."
+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:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
-"Strg+Tab, um zum nächsten Tab zu wechseln, wenn kein anderer Tab ungelesene "
-"Nachrichten enthält."
+msgstr "Strg+Tab, um zum nächsten Tab zu wechseln, wenn kein anderer Tab ungelesene Nachrichten enthält."
 
 #: ../src/common/config.py:256
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
-"werden? Bei einer leeren 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:257
-#, fuzzy
-msgid ""
-"Should we show the confirm block contact dialog or not? Empty string means "
-"we never show the dialog."
-msgstr ""
-"Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
-"werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
+msgstr "Soll der Bestätigungsdialog zum Blockieren von Benutzern angezeigt werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
 
 #: ../src/common/config.py:258
-#, fuzzy
-msgid ""
-"Should we show the confirm custom status dialog or not? Empty string means "
-"we never show the dialog."
-msgstr ""
-"Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
-"werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
+msgstr "Soll der Bestätigungsdialog für den speziellen Chatstatus angezeigt werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
 
 #: ../src/common/config.py:259
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"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."
+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:260
-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."
+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:261
-#, fuzzy
-msgid ""
-"If True, Gajim will use KDE Wallet (if kwalletcli is 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."
+msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
+msgstr "Falls aktiviert, wird Gajim KDE Wallet (wenn kwalletcli verfügbar ist) um Kontopasswörter 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 die Anzahl der angemeldeten und gesamten Kontakte in "
-"den Konto- und Gruppenreihen angezeigt."
+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, werden alle "
-"eingehenden Nachrichten so behandelt, als wären sie vom gewählten 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 diese "
-"auswählen, die die letzte Nachricht geschickt hat, falls das Chatfenster "
-"nicht bereits geöffnet 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 Chatfenster 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 ""
-"Wartezeit, bevor das \"Status ändern\"-Fenster automatisch 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 "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 ""
-"Legt die LaTeX-Anzeigengröße fest. Je höher der Wert, desto größer die "
-"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
-#, 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."
+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 Schemata in dieser Liste werden als \"wirkliche\" URIs akzeptiert. (mailto und xmpp werden separat behandelt)"
 
 #: ../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 ""
+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 "Frage nach der Offline Statusnachricht von allen nicht verbundenen Kontakten, sobald eine Verbindung zu einem Konto hergestellt wird. WARNUNG: Diese Einstellung erfordert eine Menge Sendeanfragen an den Server!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
-msgstr ""
+msgstr "Falls aktiviert, wird die Autovervollständigung in Gruppenchats ähnlich der Autovervollständigung in der Shell sein."
 
 #: ../src/common/config.py:274
-msgid ""
-"When is self contact row displayed. Can be \"always\", \"when_other_resource"
-"\" or \"never\""
-msgstr ""
+msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
+msgstr "Wann die Reihe des Eigenkontakts angezeigt wird. Kann sein \"always\" (immer), \"when_other_resource\" (wenn eine andere Ressource online ist) oder \"never\" (niemals)"
 
 #: ../src/common/config.py:286
-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."
+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:294
-msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
-msgstr ""
-"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.)"
+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:295
 msgid "If enabled, restore the last status that was used."
-msgstr ""
-"Falls aktiviert, wird die zuletzt eingestellte Statusmeldung verwendet."
+msgstr "Falls aktiviert, wird die zuletzt eingestellte Statusmeldung verwendet."
 
 #: ../src/common/config.py:297
-msgid ""
-"If True, Contacts requesting authorization will be automatically accepted."
-msgstr ""
+msgid "If True, Contacts requesting authorization will be automatically accepted."
+msgstr "Falls aktiviert, werden Authorisationsanfragen von Kontakten automatisch akzeptiert."
 
 #: ../src/common/config.py:298
-#, fuzzy
-msgid ""
-"If False, this account will be disabled and will not appear in roster window."
-msgstr ""
-"Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
+msgid "If False, this account will be disabled and will not appear in roster window."
+msgstr "Falls deaktiviert, wird das Konto deaktiviert und erscheint nicht in der Kontaktliste."
 
 # TODO: GPG/PGP unification in original strings needed
 #: ../src/common/config.py:301
-msgid ""
-"If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr ""
-"Falls deaktiviert, wird die Anwesenheit selbst dann nicht mit einem GPG-"
-"Schlüssel signiert, wenn GPG konfiguriert ist."
+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:303
 msgid "Enable ESessions encryption for this account."
@@ -4136,309 +3729,285 @@ msgstr "Aktiviere die ESession-Verschlüsselung für dieses Konto."
 
 #: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr ""
-"Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
+msgstr "Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
 
 #: ../src/common/config.py:305
-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."
+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:306
-msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
-msgstr ""
-"Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
-"übertragen wird."
+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:307
 msgid "Show a warning dialog before using standard SSL library."
-msgstr ""
-"Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-"
-"Bibliothek geschützte Verbindung übertragen wird."
+msgstr "Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-Bibliothek geschützte Verbindung übertragen wird."
 
 #: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
-msgstr ""
-"Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
+msgstr "Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Whitespace nach Untätigkeit gesendet"
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "XMPP Ping nach Untätigkeit gesendet"
 
 #: ../src/common/config.py:323
-#, fuzzy
-msgid ""
-"How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
-msgstr "Wartezeit in Sekunden, bevor eine Verbindung wieder hergestellt wird."
+msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
+msgstr "Wie viele Sekunden soll auf die Wartezeit in Sekunden, bevor eine Verbindung wieder hergestellt wird."
 
 #. yes, no, ask
 #: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2-Workaround"
 
-#: ../src/common/config.py:331
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"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:330
+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:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Antwort auf Empfangsbestätigungsanfragen"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Empfangsbestätigungen anfordern"
 
-#: ../src/common/config.py:354
-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:353
+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:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:418
-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:417
+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:419 ../src/common/config.py:422
+#: ../src/common/config.py:418
+#: ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprache, die für die Rechtschreibprüfung verwerdet werden soll"
 
 # TODO: Review by german translators: getrennte Status || getrennter Status
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "alle oder durch Leerzeichen getrennte Status"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429
+#: ../src/common/config.py:431
+#: ../src/common/config.py:432
+#: ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442
+#: ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444
+#: ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446
+#: ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461
+#: ../src/config.py:1478
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464
+#: ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:476
-msgid ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
-msgstr ""
-"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:475
+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:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485
+#: ../src/common/optparser.py:302
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489
+#: ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "Lebensmittel"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "Menschlich"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Konnte Idle-Modul nicht laden"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Falscher Server"
 
 # TODO: Review by german translators. Get closer to original string and write instead: Ungültige lokale Adresse? :-O
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Ungültige Lokale Adresse!"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
-msgstr ""
-"Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig "
-"angekommen"
+msgstr "Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig angekommen"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 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:686
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:704
+#, python-format
 msgid "Registration with agent %s succeeded"
-msgstr "Registrierung mit Transport %s war erfolgreich"
+msgstr "Registrierung mit Agent %s war erfolgreich"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 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:688
-#, 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:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:706
+#, python-format
+msgid "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr "Registrierung mit Agent %(agent)s ist mit Fehler %(error)s fehlgeschlagen: %(error_msg)s"
+
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481
+#: ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225
+#: ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Unsichtbarkeit wird nicht unterstützt"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226
+#: ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Das Konto %s unterstützt keine Unsichtbarkeit."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919
+#: ../src/common/connection.py:233
+#: ../src/config.py:1940
+#: ../src/config.py:1949
+#: ../src/config.py:2008
+#: ../src/config.py:3360
+#: ../src/dataforms_widget.py:577
+#: ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-"Es wurde eine Nachricht von einer ungültigen Jabber-ID empfangen. Die "
-"Nachricht wurde ignoriert."
+msgstr "Es wurde eine Nachricht von einer ungültigen Jabber-ID empfangen. Die Nachricht wurde ignoriert."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484
+#: ../src/common/connection.py:421
+#: ../src/gajim.py:155
+#: ../src/session.py:135
 #, 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 (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu "
-"löschen (dabei gehen alle Verläufe verloren)."
+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:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Spitzname nicht erlaubt: %s"
@@ -4446,85 +4015,80 @@ msgstr "Spitzname nicht erlaubt: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310
+#: ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Fehler beim Betreten des Chatraums"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Die maximale Anzahl an Benutzern für %s wurde erreicht"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Sie wurden aus dem Chatraum %s verbannt."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Der Chatraum %s existiert nicht."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Die Chatraumerstellung ist eingeschränkt."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
-msgstr ""
-"Sie müssen Ihren registrierten Spitznamen in diesem Chatraum %s verwenden."
+msgstr "Sie müssen Ihren registrierten Spitznamen in diesem Chatraum %s verwenden."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Sie stehen nicht in der Mitgliedliste des Chatraums %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Der Chatraum wurde gelöscht"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
-msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen."
+msgstr "Ich würde Sie gerne als Kontakt zu meiner Kontaktliste hinzufügen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Sie haben jetzt %s abonniert"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, 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 ""
-"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."
+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."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4649,92 +4213,116 @@ msgstr "Zertifizierungsstelle und Aussteller-Seriennummer unpassend"
 
 #: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
-msgstr ""
-"Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des "
-"Zertifikats."
+msgstr "Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des Zertifikats."
 
 #: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen der Anwendung"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234
+#: ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Die Nachricht kann nicht an %s gesendet werden. Die Jabber-ID ist ungültig."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Weder ist die entfernte Präsenz signiert, noch wurde ein Schlüssel zugewiesen."
+
+#: ../src/common/connection.py:259
+#, 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."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Thema: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr ""
-"Der Server %(name)s beantwortete die Registrierungsanfrage nicht korrekt: %"
-"(error)s"
+msgstr "Der Server %(name)s beantwortete die Registrierungsanfrage nicht korrekt: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr ""
-"Der Transport %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
-"%(error)s"
+msgstr "Der Transport %(name)s beantwortete die Registrierungsanfrage nicht korrekt: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075
+#: ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076
+#: ../src/gui_interface.py:705
 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:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Absender: %s"
+msgstr "Server antwortete: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125
+#: ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126
+#: ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
-msgstr ""
-"Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird "
-"wiederhergestellt."
+msgstr "Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird wiederhergestellt."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, 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:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4743,7 +4331,7 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4752,113 +4340,73 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 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:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Fehler beim Entfernen der Privatsphären-Liste"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, 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 ""
-"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."
+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:1182 ../src/dialogs.py:2666
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr ""
-"Die Nachricht kann nicht an %s gesendet werden. Die Jabber-ID ist ungültig."
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-"Weder ist die entfernte Präsenz signiert, noch wurde ein Schlüssel "
-"zugewiesen."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-"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:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Thema: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Kontakt gesendet: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "_Kontakte einladen"
+msgstr "Gesendete Kontakte:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Registrierung ist fehlgeschlagen"
+msgstr "De-Registrierung fehlgeschlagen"
 
-# FIXME: Type in original string. Should be
-# Registration with agent ...
-# FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection.py:1983
-#, fuzzy, python-format
+#: ../src/common/connection.py:2107
+#, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
-"Registrierung mit Transport %(agent)s ist mit Fehler %(error)s "
-"fehlgeschlagen: %(error_msg)s"
+msgstr "De-Registrierung mit Server %(server)s fehlgeschlagen: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129
+#: ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Beobachter"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/common/contacts.py:133
+#: ../src/common/contacts.py:335
+#: ../src/common/helpers.py:55
+#: ../src/disco.py:119
+#: ../src/disco.py:120
+#: ../src/disco.py:1464
+#: ../src/gui_interface.py:413
+#: ../src/roster_window.py:848
+#: ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572
+#: ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transporte"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Nicht in der Kontaktliste"
 
@@ -4867,14 +4415,15 @@ msgstr "Nicht in der Kontaktliste"
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Auf diesem Computer fehlen die Python-Bibliotheken für D-Bus."
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:41
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Die D-Bus-Fähigkeiten können nicht genutzt werden."
 
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus läuft nicht korrekt auf diesem Rechner"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -4886,14 +4435,11 @@ 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 ist 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 ""
@@ -4979,12 +4525,12 @@ msgid "twenty past %(0)s"
 msgstr "zwanzig nach %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "fünf vor halb %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "half past %(0)s"
 msgstr "halb %(1)s"
 
@@ -5018,7 +4564,8 @@ msgstr "fünf vor %(1)s"
 msgid "%(1)s o'clock"
 msgstr "%(1)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Nachts"
 
@@ -5054,7 +4601,8 @@ msgstr "Spät Abends"
 msgid "Start of week"
 msgstr "Anfang der Woche"
 
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
+#: ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Mitte der Woche"
 
@@ -5106,7 +4654,8 @@ msgstr "Frei zum Chatten"
 msgid "_Available"
 msgstr "_Angemeldet"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212
+#: ../src/features_window.py:118
 msgid "Available"
 msgstr "Verfügbar"
 
@@ -5224,77 +4773,80 @@ msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049
+#: ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr "Vom Chatraum %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065
+#: ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " vom Benutzer %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr "Von %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074
+#: ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d neues Ereignis"
 msgstr[1] "%d neue Ereignisse"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5310,16 +4862,17 @@ msgid "%s is not a valid loglevel"
 msgstr "%s ist kein gültiger Loglevel."
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297
+#: ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indizes"
 
@@ -5328,634 +4881,656 @@ msgstr "migriere Logdatenbank zu Indizes"
 msgid "XMPP account %s@%s"
 msgstr "XMPP-Konto %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Verängstigt"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Verblüfft"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Verliebt"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Wütend"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Ärgerlich"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Ängstlich"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Erregt"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Beschämt"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Gelangweilt"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Tapfer"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Gelassen"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Vorsichtig"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Kalt"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Zuversichtlich"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Verwirrt"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Nachdenklich"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Zufrieden"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Reizbar"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Verrückt"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Kreativ"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Neugierig"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Niedergeschlagen"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Deprimiert"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Enttäuscht"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Angewidert"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Betroffen"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Abgelenkt"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Verlegen"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Neidisch"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Aufgeregt"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Kokett"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustriert"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Dankbar"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Bekümmert"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Mürrisch"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Schuldbewusst"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Fröhlich"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Hoffnungsvoll"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Heiß"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Demütig"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Gedemütigt"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Hungrig"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Verletzt"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Beeindruckt"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Bewundernd"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Verliebt"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Entrüstet"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Interessiert"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Berauscht"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Unbesiegbar"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Neidisch"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Einsam"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Verloren"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Glücklich"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Gemein"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Launisch"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervös"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Beleidigt"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Empört"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Scherzhaft"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Stolz"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Entspannt"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Erleichtert"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Reuevoll"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Ruhelos"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Traurig"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarkastisch"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Zufrieden"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Ernst"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Geschockt"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Schüchtern"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Krank"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Müde"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Gestresst"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Stark"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Überrascht"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Dankbar"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Durstig"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Müde"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Schwach"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Besorgt"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Haushalt erledigen"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Lebensmittel einkaufen"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Putzen"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Kochen"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Instandhaltung"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Geschirr spülen"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Wäsche waschen"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Gartenarbeit"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Besorgungen machen"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Hund ausführen"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Etwas trinken"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Bier trinken"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Kaffee trinken"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Tee trinken"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Zwischenmahlzeit"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Frühstücken"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Abendessen"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Mittagessen"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Sport machen"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133
+#: ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Rad fahren"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Tanzen"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Wandern"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Joggen"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Beim Sport"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Laufen"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Ski fahren"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Schwimmen"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Trainieren"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Körperpflege"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "Im Bad"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Zähne putzen"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Beim Frisör"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Rasieren"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Ein Bad nehmen"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Unter der Dusche"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Termin"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Freier Tag"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Rumhängen"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Verstecken"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Beten"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Geplanter Urlaub"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Nachdenken"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Entspannen"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Angeln"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Spielen"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Ausgehen"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Feiern"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Lesen"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Studieren"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Shoppen"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Rauchen"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Unter Leuten"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Sonnenbaden"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Fernsehen"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Film schauen"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Im Gespräch"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "Im echten Leben"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Am Videotelefon"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Reisen"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Pendeln"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Fahren"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "Im Auto"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "Im Bus"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "Im Flugzeug"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "Im Zug"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "Auf einer Reise"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Spazierengehen"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Programmieren"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "In einer Besprechung"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Lernen"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Schreiben"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Unbekannter Künstler"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Unbekannter Titel"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Unbekannte Quelle"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> von <i>%(artist)s</i>\n"
+"aus <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5963,54 +5538,19 @@ msgid "Unable to bind to port %s."
 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:301
-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.]"
+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:94
-#, 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."
-
-# TODO: GPG/PGP unification in original strings needed
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Keine OpenPGP-Passphrase gewählt."
-
-# TODO: GPG/PGP unification in original strings needed
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Um weiterhin Nachrichten senden und empfangen zu können, müssen Sie sich "
-"erneut verbinden."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi-Fehler"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6019,58 +5559,46 @@ msgstr ""
 "%s\n"
 "Lokaler Nachrichtenversand funktioniert eventuell nicht richtig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bitte überprüfen Sie, ob Avahi bzw. Bonjour installiert ist."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 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:200
 #, python-format
 msgid "Unable to bind to port %d."
 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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 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:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, 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."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Diese Nachricht ist verschlüsselt]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Die Nachricht konnte nicht gesendet werden."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Der Kontakt ist offline. Ihre Nachricht konnte nicht gesendet werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
-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/connection_zeroconf.py:359
+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:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
@@ -6078,255 +5606,254 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157
+#: ../src/config.py:586
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Standard-Nachricht"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654
+#: ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Kein Wörterburch für die Sprache %s verfügbar"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, 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 nutzen zu können."
+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:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "Statusnachricht"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394
+#: ../src/dialogs.py:2232
+#: ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014
+#: ../src/disco.py:831
+#: ../src/disco.py:1690
+#: ../src/disco.py:1992
+#: ../src/history_window.py:89
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Jetzt erneut anmelden?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-"Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut "
-"anmelden."
+msgstr "Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut anmelden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620
+#: ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden."
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785
+#: ../src/config.py:1829
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse anzeigen, bevor das Konto entfernt wird."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825
+#: ../src/config.py:2348
+#: ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden."
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
-msgstr ""
-"Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
+msgstr "Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
-msgstr ""
-"Damit der Kontoname geändert werden kann, müssen Sie zuvor alle neuen "
-"Ereignisse lesen."
+msgstr "Damit der Kontoname geändert werden kann, müssen Sie zuvor alle neuen Ereignisse lesen."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Der Kontoname wird bereits verwendet."
 
-#: ../src/config.py:1772
-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:1837
+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:1776 ../src/config.py:1780
+#: ../src/config.py:1841
+#: ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Der Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Der Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Konto umbenennen"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, 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:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Die Jabber-ID muss in der Form \"benutzer@servername\" sein."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158
+#: ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159
+#: ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Die geheimen Schlüssel konnten nicht empfangen werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "Es gab ein Problem beim Empfangen Ihres geheimen OpenPGP-Schlüssels."
+msgstr "Kein GPG-Schlüssel verfügbar."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP-Schlüssel-Auswahl"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Das angegebene Konto ist nicht verfügbar"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
-msgstr ""
-"Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen "
-"ändern können."
-
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+msgstr "Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen ändern können."
+
+#: ../src/config.py:2231
+#: ../src/dialogs.py:2031
+#: ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405
+#: ../src/disco.py:477
+#: ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden."
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
-msgstr ""
-"Sie müssen angemeldet sein, um Ihre persönlichen Informationen ändern zu "
-"können."
+msgstr "Sie müssen angemeldet sein, um Ihre persönlichen Informationen ändern zu können."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt keine vCard."
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349
+#: ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr ""
-"Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
+msgstr "Zum Deaktivieren des Kontos, müssen Sie offline sein."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 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:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600
+#: ../src/disco.py:838
+#: ../src/history_manager.py:208
 msgid "JID"
 msgstr "Jabber-ID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Verbannen …"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6334,11 +5861,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Mitglied hinzufügen …"
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6346,11 +5873,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Besitzer hinzufügen …"
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6358,11 +5885,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Administrator hinzufügen …"
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6370,8 +5897,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6380,135 +5906,130 @@ msgid ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain)."
 msgstr ""
-"Mögliche Werte:\n"
-"1. benutzer@servername/Ressource (nur die angegebene Ressource trifft zu).\n"
-"2. benutzer@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@servername, jeder servername/Ressource oder jede Adresse, die eine "
-"Subdomain enthält)."
+"Kann einen der folgenden Werte annehmen:\n"
+"1. benutzer@domain/resource (nur die angegebene Ressource trifft zu).\n"
+"2. benutzer@domain (jede Ressource trifft zu).\n"
+"3. servername/resource (nur die angegebene Ressource trifft zu)\n"
+"4. servername (sowohl die Domain selbst trifft zu als auch jeder benutzer@domain, jede domain/Ressource oder jede Adresse, die eine Subdomain enthält)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785
+#: ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786
+#: ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787
+#: ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Das Konto \"%s\" ist mit dem Server verbunden"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 # TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
 
-#: ../src/config.py:2923
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Bitte Server- und Chatraumfeld ausfüllen oder gespeicherten Chatraum löschen."
+#: ../src/config.py:3001
+msgid "Please be sure to fill out server and room fields or remove this bookmark."
+msgstr "Bitte Server- und Chatraumfeld ausfüllen oder gespeicherten Chatraum löschen."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119
+#: ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120
+#: ../src/config.py:3134
+#: ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Spitzname nicht erlaubt: %s"
+msgstr "Zeichen nicht erlaubt"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133
+#: ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Ungültiger Eintrag"
+msgstr "Ungültiger Raum"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Konto wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
-msgid ""
-"You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menu item under the Edit menu from the main "
-"window."
-msgstr ""
-"Sie können die erweiterten Kontooptionen über die Schaltfläche \"Erweitert\" "
-"oder den Konto-Menüpunktes im Menü \"Bearbeiten\" des Hauptfensters "
-"erreichen."
+#: ../src/config.py:3300
+#: ../src/config.py:3306
+msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menu item under the Edit menu from the main window."
+msgstr "Sie können erweiterte Kontooptionen festlegen, indem Sie den Erweitert Button drücken, oder später den Eintrag Konto im Ändern Menü in der Kontaktliste auswählen."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
-msgstr ""
-"Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
+msgstr "Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Bitte geben Sie den Server an, bei dem Sie sich registrieren möchten."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439
+#: ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Zertifikat bereits in der Datei"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440
+#: ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
-msgstr ""
-"Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in der "
-"Datei %s befindet."
+msgstr "Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in der Datei %s befindet."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6523,7 +6044,8 @@ msgstr ""
 "SSL-Fehler: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516
+#: ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6534,63 +6056,64 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543
+#: ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Der Kontoname ist bereits vergeben"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Nächste empfangene Nachricht ausgewählt"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Nächste empfangene Nachricht nicht ausgewählt"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Hervorhebung von Chatraum-Nachrichten"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Chatraum-Nachricht empfangen"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "E-Mail über Google-Mail empfangen"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6600,233 +6123,224 @@ msgstr ""
 "am anderen Ende eingetroffen ist. Falls es längere\n"
 "Zeit bleibt, ging die Nachricht höchstwahrscheinlich verloren."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
-msgstr ""
-"Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in "
-"diesem Chatraum gesagt wurde."
+msgstr "Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in diesem Chatraum gesagt wurde."
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Beenden"
+msgstr "_Zitieren"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Im Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In der URL für die Websuche fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Im _Internet hiernach suchen"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
-#: ../src/conversation_textview.py:1274
-msgid "Yesterday"
-msgstr "Gestern"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
 #, python-format
-msgid "%i days ago"
-msgstr "Vor %i Tagen"
+msgid "Yesterday"
+msgid_plural "%i days ago"
+msgstr[0] "Gestern"
+msgstr[1] "vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330
+#: ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Die Jabber-ID steht bereits in der Liste"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
-msgstr ""
-"Die eingegebene Jabber-ID ist bereits in der Liste. Wählen Sie bitte eine "
-"andere."
+msgstr "Die eingegebene Jabber-ID ist bereits in der Liste. Wählen Sie bitte eine andere."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "neu@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596
+#: ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "neu%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Stimmung setzen"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusnachricht"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Statusnachricht"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Statusnachricht überschreiben"
 
-#: ../src/dialogs.py:773
-msgid ""
-"This name is already used. Do you want to overwrite this status message?"
-msgstr ""
-"Dieser Name wird bereits verwendet. Möchten Sie die Statusnachricht "
-"überschreiben?"
+#: ../src/dialogs.py:794
+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:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Als Vorlage für Statusnachrichten speichern"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG-Nummer"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo-Adresse"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, 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:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1041
+#: ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine Ressource enthalten."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakt bereits in der Kontaktliste"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Ein Jabber-Client in GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Zuletzt möchten wird gerne allen Paket-Verwaltern danken."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
@@ -6836,112 +6350,113 @@ msgstr ""
 "Nico Gulden (cilugnedon AT gmx.de)\n"
 "Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, 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 nutzen zu können.\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"
 "Falsch geschriebene Wörter können nicht hervorgehoben werden."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830
+#: ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Die Jabber-ID enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnement-Anfrage für das Konto %(account)s von %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anfrage von %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026
+#: ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Chatraum %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Sie können einen Chatraum erst betreten, wenn Sie verbunden sind."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Chatraum betreten mit dem Konto %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Ungültiger Kontoname"
+msgstr "Ungültiges Konto"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
-msgid ""
-"You have to choose an account from which you want to join the groupchat."
-msgstr "Das Konto, mit dem Sie den Chatraum betreten möchten"
+#: ../src/dialogs.py:2161
+msgid "You have to choose an account from which you want to join the groupchat."
+msgstr "Sie müssen ein Konto auswählen, mit dem Sie den Gruppenchat betreten möchten."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175
+#: ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber-ID für den Chatraum"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Bitte gib die Gruppenchat Jabber ID als raum@server ein."
+
+#: ../src/dialogs.py:2182
+#: ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Dies ist kein Chatraum"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ist nicht der Name eines Chatraums."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sie müssen verbunden sein, um Ihre Kontakte synchronisieren zu können."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Das Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
-msgstr ""
-"Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
+msgstr "Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Konto %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6950,302 +6465,352 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384
+#: ../src/dialogs.py:2767
+#: ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385
+#: ../src/dialogs.py:2768
+#: ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394
+#: ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort ändern zu können."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 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:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469
+#: ../src/notify.py:263
+#: ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471
+#: ../src/notify.py:271
+#: ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473
+#: ../src/notify.py:294
+#: ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473
+#: ../src/notify.py:275
+#: ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474
+#: ../src/notify.py:282
+#: ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474
+#: ../src/gui_interface.py:1315
+#: ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476
+#: ../src/gui_interface.py:1382
+#: ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478
+#: ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349
+#: ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Dateiübertragungsfehler"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480
+#: ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449
+#: ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung beendet"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481
+#: ../src/gui_interface.py:1430
+#: ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483
+#: ../src/gui_interface.py:1123
+#: ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485
+#: ../src/notify.py:255
+#: ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, 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:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-Konsole für %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML-Konsole"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
-#, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Ich würde Dich gerne zu meiner Kontaktliste hinzufügen."
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+msgid "add"
+msgstr "hinzufügen"
+
+#: ../src/dialogs.py:2958
+msgid "modify"
+msgstr "Verändern"
+
+#: ../src/dialogs.py:2959
+msgid "remove"
+msgstr "Entfernen"
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#: ../src/dialogs.py:2987
+#, python-format
+msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
+msgstr "<b>%(jid)s</b> möchte gerne einige Kontakte in deiner Kontaktliste <b>%(action)s</b>."
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003
+#: ../src/dialogs.py:3049
 msgid "Add"
-msgstr ""
+msgstr "Hinzufügen"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005
+#: ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Launisch"
+msgstr "Verändern"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Jabber-ID:"
+msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Gruppe"
+msgstr "Gruppen"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen."
+msgstr "%s hat mir vorgeschlagen Sie als Kontakt zu meiner Kontaktliste hinzuzufügen."
+
+#: ../src/dialogs.py:3139
+#, python-format
+msgid "Added  %s contacts"
+msgstr "%s Kontakte hinzugefügt"
+
+#: ../src/dialogs.py:3176
+#, python-format
+msgid "Removed  %s contacts"
+msgstr "%s Kontakte entfernt"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatsphären-Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, 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:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
-msgstr ""
-"Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
-"können."
+msgstr "Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu können."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Sie wurden in einen Chatraum eingeladen"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact hat Sie in den Chatraum %(room_jid)s eingeladen"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740
+#: ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav-Dateien"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "Nr."
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7254,98 +6819,90 @@ msgid ""
 msgstr ""
 "Ihre Unterhaltung mit <b>%(jid)s</b> ist verschlüsselt.\n"
 "\n"
-"Der kurze 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:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Sie haben die Identität dieses Kontaktes bereits überprüft."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551
+#: ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Kontaktidentität wurde überprüft"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Erneut überprüfen …"
 
-#: ../src/dialogs.py:4423
-msgid ""
-"To be certain that <b>only</b> the expected person can read your messages or "
-"send you messages, you need to verify their identity by clicking the button "
-"below."
-msgstr ""
-"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:4564
+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:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567
+#: ../src/dialogs.py:4621
+#: ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktidentität nicht überprüft"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Überprüfen …"
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, 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 kurzen "
-"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 kurze 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:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
-msgstr ""
-"Haben Sie mit dem Kontakt gesprochen, um den kurzen Authentifizierungs-"
-"Schluessel zu überprüfen?"
+msgstr "Haben Sie mit dem Kontakt gesprochen, um den kurzen Authentifizierungs-Schluessel zu überprüfen?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, 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."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 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."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4492
-msgid ""
-"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
-"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
-msgstr ""
-"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:4635
+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."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4498
-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/dialogs.py:4641
+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/dialogs.py:4708
+msgid "an audio and video"
+msgstr "eine Audio und Video"
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr "eine Audio"
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr "eine Video"
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
+msgstr "%(contact)s möchte eine %(type)s-Sitzung mit dir starten. Möchten Sie den Anruf annehmen?"
 
 #: ../src/disco.py:118
 msgid "Others"
@@ -7356,380 +6913,350 @@ msgstr "Andere"
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein, um die Dienste durchsuchen zu können"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste des Kontos %s durchsuchen"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:660
-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:707
+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:664 ../src/disco.py:960
+#: ../src/disco.py:711
+#: ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
-msgstr ""
-"Dieser Art von Dienst enthält keine Objekte, die durchsucht werden können."
+msgstr "Dieser Art von Dienst enthält keine Objekte, die durchsucht werden können."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751
+#: ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Befehl ausführen"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298
+#: ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Durchsuche %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781
+#: ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Chatraum ist bereits gespeichert"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782
+#: ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791
+#: ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Chatraum wurde erfolgreich gespeichert"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792
+#: ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Sie können die gespeicherten Chaträume über das Aktionen-Menü in der "
-"Kontaktliste bearbeiten"
+msgstr "Sie können die gespeicherten Chaträume über das Aktionen-Menü in der Kontaktliste bearbeiten"
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Neue Nachricht"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr "SSL/TLS-Zertifikatprüfung"
 
-#: ../src/features_window.py:47
-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:49
+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:48 ../src/features_window.py:49
+#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Erfordert python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr ""
-"Ermöglicht serverloses Chatten mit automatischer Clienterkennung in lokalen "
-"Netzwerken."
+msgstr "Ermöglicht serverloses Chatten mit automatischer Clienterkennung in lokalen Netzwerken."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Erfordert python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr ""
-"Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour (Englisch))."
+msgstr "Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour (Englisch))."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 msgid "Command line"
 msgstr "Kommandozeilensteuerung"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Ermöglicht es, Gajim per Skript über die Konsole zu steuern."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Erfordert python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59
+#: ../src/features_window.py:63
+#: ../src/features_window.py:67
+#: ../src/features_window.py:71
+#: ../src/features_window.py:75
+#: ../src/features_window.py:83
+#: ../src/features_window.py:87
+#: ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Funktion unter Windows nicht verfügbar."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
 msgstr "OpenPGP-Verschlüsselung"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Ermöglicht die Verschlüsselung von Nachrichten per OpenPGP."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Erfordert GnuPG und python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 msgid "Network-manager"
 msgstr "Netzwerk-Manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Ermöglicht die automatische Erkennung des Netzwerkstatus."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Erfordert gnome-network-manager und python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Sitzungsverwaltung"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
-msgstr ""
-"Die Gajim-Sitzung kann beim Logout gespeichert und beim Login "
-"wiederhergestellt werden."
+msgstr "Die Gajim-Sitzung kann beim Logout gespeichert und beim Login wiederhergestellt werden."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Erfordert python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 msgid "Password encryption"
 msgstr "Sichere Kennwortverwaltung"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passwörter können sicher anstatt nur im Klartext gespeichert werden."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Erfordert gnome-keyring und python-gnome2-desktop."
+msgstr "Erfordert gnome-keyring und python-gnome2-desktop, oder kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Ermöglicht Verbindungen zu Servern, die SRV-DNS-Einträge verwenden."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Erfordert dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Erfordert nslookup zur Nutzung von SRV-Einträgen."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Rechtschreibprüfung"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
-msgstr ""
-"Ermöglicht das Überprüfen verfasster Nachrichten auf Rechtschreibfehler."
+msgstr "Ermöglicht das Überprüfen verfasster Nachrichten auf Rechtschreibfehler."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr "Erfordert die libgtkspell-Bibliothek."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 msgid "Notification"
 msgstr "Benachrichtigungen"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Ermöglicht passive Popups, die über neue Ereignisse informieren."
 
-#: ../src/features_window.py:84
-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:86
-msgid "Trayicon"
-msgstr "Tray-Symbol"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Ein Symbol im Systemtray, das den Status widerspiegelt."
+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:88
-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:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Erforder PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatischer Status"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-"Emöglicht die Messung der Zeit, während der der Computer nicht benutzt wird, "
-"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:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr "Erfordert die libxss-Bibliothek."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr "Erfordert python-gnome2 (Version 2.5)."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-"Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird als "
-"LaTeX interpretiert."
+msgstr "Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird als LaTeX interpretiert."
 
-#: ../src/features_window.py:96
-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:94
+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:97
-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:95
+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:98
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
 msgstr "ESession-Verschlüsselung"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Nachrichten können per ESession verschlüsselt werden."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Erfordert python-crypto"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST-Generator"
 
-#: ../src/features_window.py:103
-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:101
+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:104 ../src/features_window.py:105
+#: ../src/features_window.py:102
+#: ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Erfordert python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr "Anklickbare Links"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Anklickbare URLs im Chatfenster."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Erfordert python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr "Audio / Video"
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr "Audio und Video Chat sind möglich."
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr "Erfordert python-farsight."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Feature"
 
@@ -7745,143 +7272,149 @@ msgstr "Zeit"
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177
+#: ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178
+#: ../src/filetransfers_window.py:323
 #, 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:520
+#: ../src/filetransfers_window.py:187
+#: ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Sie"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Absender: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung abgebrochen"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Empfänger: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Fehlermeldung: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Datei auswählen …"
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273
+#: ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Auf diese Datei kann nicht zugegriffen werden"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Diese Datei wird von einem anderen Prozess verwendet."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s möchte Ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342
+#: ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
-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:343
+#: ../src/gtkgui_helpers.py:860
+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:818
+#: ../src/filetransfers_window.py:359
+#: ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359
+#: ../src/gtkgui_helpers.py:864
 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:825
+#: ../src/filetransfers_window.py:369
+#: ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369
+#: ../src/gtkgui_helpers.py:872
 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:379
 msgid "Save File as..."
 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7889,32 +7422,35 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585
+#: ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Datei: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 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:660
+#: ../src/filetransfers_window.py:613
+#: ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615
+#: ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pause"
 
@@ -7925,27 +7461,23 @@ msgstr "Gajim benötigt einen laufenden X-Server. Abbruch …"
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "Import von PyGTIK fehlgeschlagen: %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim benötigt PyGTK 2.6 oder höher"
+msgstr "Gajim benötigt PyGTK 2.12 oder höher"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim benötigt PyGTK 2.6 oder höher. Abbruch …"
+msgstr "Gajim benötigt PyGTK 2.12 oder höher. Abbruch …"
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim benötigt GTK 2.6 oder höher"
+msgstr "Gajim benötigt GTK 2.12 oder höher"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim benötigt GTK 2.6+. Abbruch …"
+msgstr "Gajim benötigt GTK 2.12 oder höher. Abbruch …"
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7953,19 +7485,12 @@ msgstr "Der GTK+-Laufzeitumgebung fehlt die libglade-Unterstützung"
 
 #: ../src/gajim.py:191
 #, 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:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Bitte stellen Sie sicher, dass die auf Ihrem Computer verwendeten Versionen "
-"von GTK+ und PyGTK libglade-Unterstützung besitzen."
+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:198
 msgid "Gajim needs PySQLite2 to run"
@@ -7977,19 +7502,15 @@ msgstr "Gajim benötigt pywin32 zum Laufen"
 
 #: ../src/gajim.py:207
 #, 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 Computer 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:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim läuft bereits"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7997,830 +7518,352 @@ msgstr ""
 "Gajim schein bereits zu laufen.\n"
 "Soll eine weitere Instanz gestartet werden?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Passphrase benötigt"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:441
-#, 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)."
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Kein GPG-Schlüssel zugewiesen"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Falsche Passphrase"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr ""
-"Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
-"Abbrechen."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"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 wird bereits im Chatraum %s verwendet oder wurde "
-"von einem anderen Benutzer registriert.\n"
-"Bitte geben Sie einen anderen Benutzernamen an:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Akzeptieren Sie diese Anfrage?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) Autorisierung für %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Verbindung fehlgeschlagen"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Fehler %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-msgid "Subscription request"
-msgstr "Abonnementanfrage"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorisierung akzeptiert"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "\"%s\" hat Sie autorisiert, seinen Status zu sehen."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Er wird Ihnen von nun an als offline angezeigt.\n"
-"Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-msgid "Unsubscribed"
-msgstr "Abbestellt"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s heißt jetzt %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s ist jetzt %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s hat das Thema in %(subject)s geändert"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"Eine nicht Privatsphären-bezogene Chatraum-Konfigurations-Änderung ist "
-"aufgetreten"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Der Chatraum ist jetzt nicht mehr anonym"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Der Chatraum ist jetzt semi-anonym"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Der Chatraum ist jetzt komplett anonym"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Für das Betreten des Chatraumes %s wird ein Passwort benötigt."
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1526
-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"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Ihre Passphrase ist falsch"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Ihre Passphrase ist falsch"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG ist nicht benutzbar"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1559
-#, 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:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Nicht noch einmal fragen"
-
-#: ../src/gajim.py:1571
-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:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Neue E-Mail über %(gmail_mail_address)s empfangen"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Sie haben %d ungelesene E-Mail"
-msgstr[1] "Sie haben %d ungelesene E-Mails"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Von: %(from_address)s\n"
-"Betreff: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s möchte Ihnen eine Datei senden."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Entfernt den Kontakt aus der Kontaktliste"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Fehler beim Lesen der Datei:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Die Übermittlung der Datei %(filename)s von %(name)s war erfolgreich."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr ""
-"Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
-"Eventuell wurde sie verändert."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Die Nachricht konnte nicht entschlüsselt werden"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Benutzernamenkonflikt"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Fehler:"
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Ressourcenkonflikt"
-
-#: ../src/gajim.py:2107
-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:2166
-msgid "Error verifying SSL certificate"
-msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"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:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignoriere den Fehler für dieses Zertifikat."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "SSL-Zertifikat-Fehler"
-
-# FIXME: Check English. Should be:
-# your connection has been hacked.
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 %(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 sich dennoch verbinden und den Fingerabdruck des Zertifikats "
-"aktualisieren?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Unsichere Verbindung"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"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:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"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:2279
-msgid "PEP node was not removed"
-msgstr "PEP-Knoten wurde nicht entfernt"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Emoticons deaktiviert"
-
-#: ../src/gajim.py:2785
-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:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"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:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Sie können einen Chatraum nicht betreten, wenn Sie unsichtbar sind."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Konnte Einstellungen nicht speichern"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Zeigt die Hilfe für einen bestimmten Befehl"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "Befehl"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: ../src/gajim-remote.py:94
-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 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:93
+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:96
+#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Ändert den Status eines oder mehrerer Konten"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "Status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "Mögliche Werte: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:273
 msgid "message"
 msgstr "Nachricht"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: ../src/gajim-remote.py:112
-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:111
+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:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Ändert den Status eines oder mehrerer Konten"
+msgstr "Ändert die Priorität eines oder mehrerer Konten"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Priori_tät:"
+msgstr "Priorität"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Ich möchte ein neues Konto _erstellen"
+msgstr "Priorität, die Sie dem Konto geben möchten"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"Ändere Status des Kontos \"account\". Falls nicht angegeben, ändere Status "
-"aller Konten für die die Option \"Kontostatus mit globalem Status "
-"synchronisieren\" aktiviert ist"
+#: ../src/gajim-remote.py:121
+msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
+msgstr "Priorität für das Konto ändern. Falls nicht angegeben, ändere den Status aller Konten für die die Option \"Kontostatus mit globalem Status synchronisieren\" aktiviert ist"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr ""
-"Zeige Chatfenster, sodass eine Nachricht an einen Kontakt gesendet werden "
-"kann"
+msgstr "Zeige Chatfenster, sodass eine Nachricht an einen Kontakt gesendet werden kann"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Jabber-ID des Kontakts, mit dem Sie chatten möchten"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:221
 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:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "Nachrichteninhalt. Das Konto muss angegeben werden oder \"\""
 
-#: ../src/gajim-remote.py:140
-msgid ""
-"Sends new chat message to a contact in the roster. Both OpenPGP key and "
-"account are optional. If you want to set only 'account', without 'OpenPGP "
-"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:139
+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:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Jabber-ID des Kontakts, der die Nachricht empfangen soll"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:159
 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:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 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:153
-msgid ""
-"Sends new single message to a contact in the roster. Both OpenPGP key and "
-"account are optional. If you want to set only 'account', without 'OpenPGP "
-"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:152
+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:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "Betreff"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sendet eine neue Nachricht an einen Chatraum, den Sie betreten haben."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "Jabber-ID des Chatraums, der die Nachricht empfangen soll"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über einen Kontakt"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Jabber-ID des Kontakts"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "Datei"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Dateipfad"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "Wenn angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Zeigt alle Einstellungen und ihre Werte"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setzt den Wert von 'Schlüssel' auf 'Wert'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
-msgstr ""
-"'Schlüssel' ist der Name der Einstellung, 'Wert' ist der der einzustellende "
-"Wert"
+msgstr "'Schlüssel' ist der Name der Einstellung, 'Wert' ist der der einzustellende Wert"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Löscht eine Einstellung"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "Schlüssel"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Schreibt die aktuellen Gajim-Einstellungen in die Konfigurationsdatei"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus der Kontaktliste"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Fügt den Kontakt der Kontaktliste hinzu"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "Jabber-ID"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Fügt einen neuen Kontakt zu diesem Konto hinzu"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
-msgstr ""
-"Gibt den derzeitigen Status zurück (den globalen Status, es sei denn, es "
-"wird ein Konto angegeben)"
+msgstr "Gibt den derzeitigen Status zurück (den globalen Status, es sei denn, es wird ein Konto angegeben)"
 
-#: ../src/gajim-remote.py:243
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"Gibt die derzeitige Statusnachricht zurück (die globale, es sei denn, es "
-"wird ein Konto angegeben)"
+#: ../src/gajim-remote.py:242
+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:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öffnet den Dialog zum Beginnen eines Chats"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Startet einen Chat über dieses Konto"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Benutzerdefinierten XML-Code senden"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
-#: ../src/gajim-remote.py:263
-msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
-"der XML-Code an alle Konten gesendet"
+#: ../src/gajim-remote.py:262
+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:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Verarbeite einen xmpp:/-URI"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "Zu verarbeitender URI"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Konto, mit dem er verarbeitet werden soll"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
 msgstr "Nachrichteninhalt"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Neuen Chatraum betreten"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "Chatraum"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "Jabber-ID des Chatraums"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "Spitzname"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Spitzname, der benutzt werden soll"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "Passwort"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Das Passwort, um den Chatraum zu betreten"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Das Konto, mit dem Sie den Chatraum betreten möchten"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_Jabber-ID\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8829,17 +7872,15 @@ msgstr ""
 "'%s' ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-"Gajim scheint nicht gestartet zu sein, daher kann gajim-remote nicht genutzt "
-"werden."
+msgstr "Gajim scheint nicht gestartet zu sein, daher kann gajim-remote nicht genutzt werden."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8848,16 +7889,16 @@ msgstr ""
 "Verwendung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8866,27 +7907,25 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Der Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, 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\" ein, um weitere Informationen zu "
-"erhalten"
+"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu erhalten"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, 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\" ein, um weitere Informationen zu "
-"erhalten"
+"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu erhalten"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Falscher URI"
 
@@ -8913,160 +7952,184 @@ msgstr "Sie können Ihr derzeitiges Design nicht löschen"
 
 #: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
-msgstr ""
-"Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
+msgstr "Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-msgstr ""
-"Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat "
-"den Chatraum verlassen."
+msgstr "Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat den Chatraum verlassen."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228
+#: ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Chatraum-Aufzeichnung ist aktiviert"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Ein neuer Chatraum wurde erstellt"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Der Server hat Ihren Chatraum-Nick zugewiesen oder verändert"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
-msgstr ""
-"%(nick)s wurde von %(who)s aus dem Chatraum geworfen. Grund: %(reason)s"
+msgstr "%(nick)s wurde von %(who)s aus dem Chatraum geworfen. Grund: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288
+#: ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s heißt jetzt %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326
+#: ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "Zugehörigkeit geändert:"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
-msgstr ""
-"Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
+msgstr "Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "Computer wird heruntergefahren"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, 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:1381
+#: ../src/groupchat_control.py:1418
 #, 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:1396
+#: ../src/groupchat_control.py:1433
 #, 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:1400
+#: ../src/groupchat_control.py:1437
 #, 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:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Chatraum betreten"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473
+#: ../src/gui_interface.py:919
+#: ../src/history_window.py:442
+#: ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s ist jetzt %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
 
-#: ../src/groupchat_control.py:1670
-msgid ""
-"If you close this window, you will be disconnected from this group chat."
-msgstr ""
-"Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Chatraum "
-"geschlossen."
+#: ../src/groupchat_control.py:1708
+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:1712
+#: ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940
+#: ../src/gui_interface.py:1975
+#: ../src/message_window.py:227
+#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301
+#: ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Nicht noch einmal fragen"
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Bitte wählen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 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:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Lösche %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9074,22 +8137,23 @@ msgstr ""
 "Der Chatraum wird endgültig gelöscht.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Sie können auch einen alternativen Chatraum eintragen:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rauswerfen"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968
+#: ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -9099,12 +8163,8 @@ msgid "A programming error has been detected"
 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 ""
-"Der Fehler ist vermutlich nicht fatal, sollte aber 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"
@@ -9115,64 +8175,455 @@ msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Fehler bei der Dateianalyse:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr ""
-"Konnte nicht an %s schreiben. Die 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:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ist nicht Ihr Standard-Jabber-Client"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Möchten Sie Gajim zu Ihrem Standard-Jabber-Client machen?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 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:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Erweiterung wird nicht unterstützt."
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, 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:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Bild speichern unter …"
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"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 wird bereits im Chatraum %s verwendet oder wurde von einem anderen Benutzer registriert.\n"
+"Bitte geben Sie einen anderen Benutzernamen an:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Benutze bei einem Konflikt immer diesen Spitznamen"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Akzeptieren Sie diese Anfrage?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
+
+#: ../src/gui_interface.py:154
+#, 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/gui_interface.py:205
+#: ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Verbindung fehlgeschlagen"
+
+#: ../src/gui_interface.py:544
+#: ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Fehler %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558
+#: ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599
+#: ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Abonnementanfrage"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorisierung akzeptiert"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "\"%s\" hat Sie autorisiert, seinen Status zu sehen."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Er wird Ihnen von nun an als offline angezeigt.\n"
+"Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
+
+#: ../src/gui_interface.py:663
+#: ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Abbestellt"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s hat das Thema in %(subject)s geändert"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "Eine nicht Privatsphären-bezogene Chatraum-Konfigurations-Änderung ist aufgetreten"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Der Chatraum ist jetzt nicht mehr anonym"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Der Chatraum ist jetzt semi-anonym"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Der Chatraum ist jetzt komplett anonym"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Für das Betreten des Chatraumes %s wird ein Passwort benötigt."
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gui_interface.py:1137
+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"
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gui_interface.py:1139
+#: ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Ihre Passphrase ist falsch"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "OpenGPG Passphrase ist falsch"
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG-Schlüssel ist nicht vertrauenswürdig"
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gui_interface.py:1170
+msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
+msgstr "Der GPG-Schlüssel zum Verschlüsseln dieses Chats ist nicht vertrauenswürdig. Möchten Sie diese Nachricht wirklich verschlüsseln?"
+
+#: ../src/gui_interface.py:1182
+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/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Neue E-Mail über %(gmail_mail_address)s empfangen"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Sie haben %d ungelesene E-Mail"
+msgstr[1] "Sie haben %d ungelesene E-Mails"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Von: %(from_address)s\n"
+"Betreff: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s möchte Ihnen eine Datei senden."
+
+#: ../src/gui_interface.py:1417
+#: ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Entfernter Kontakt unterbrach die Dateiübertragung"
+
+#: ../src/gui_interface.py:1419
+#: ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Fehler beim Öffnen der Datei:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Die Übermittlung der Datei %(filename)s von %(name)s war erfolgreich."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
+"Eventuell wurde sie verändert."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Die Nachricht konnte nicht entschlüsselt werden"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Benutzernamenkonflikt"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Fehler:"
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Ressourcenkonflikt"
+
+#: ../src/gui_interface.py:1722
+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/gui_interface.py:1771
+#, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s möchte einen Sprachchat beginnen."
+
+#: ../src/gui_interface.py:1774
+msgid "Voice Chat Request"
+msgstr "Anfrage für Sprachchat"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"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/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignoriere den Fehler für dieses Zertifikat."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "SSL-Zertifikat-Fehler"
+
+# FIXME: Check English. Should be:
+# your connection has been hacked.
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 %(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 sich dennoch verbinden und den Fingerabdruck des Zertifikats aktualisieren?"
+
+#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Unsichere Verbindung"
+
+#: ../src/gui_interface.py:1937
+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/gui_interface.py:1939
+#: ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
+
+#: ../src/gui_interface.py:1972
+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/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP-Knoten wurde nicht entfernt"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547
+#: ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Emoticons deaktiviert"
+
+#: ../src/gui_interface.py:2548
+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/gui_interface.py:2570
+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/gui_interface.py:2598
+#: ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Sie können einen Chatraum nicht betreten, wenn Sie unsichtbar sind."
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Konnte Einstellungen nicht speichern"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Passphrase benötigt"
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gui_interface.py:3463
+#, 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)."
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "GPG-Schlüssel abgelaufen"
+
+# TODO: GPG/PGP unification in original strings needed
+# FIXME: should be "has expired"
+#: ../src/gui_interface.py:3478
+#, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Ihr GPG-Schlüssel ist abgelaufen. Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Falsche Passphrase"
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf Abbrechen."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "Neuer Gruppenchat"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
-msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen"
+msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen"
 
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
@@ -9184,686 +8635,637 @@ msgid "Contacts"
 msgstr "Kontakte"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_manager.py:174
+#: ../src/history_manager.py:214
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:180
+#: ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_manager.py:188
+#: ../src/history_manager.py:220
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Nachricht"
 
 #: ../src/history_manager.py:248
-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)"
+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:250
 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 den Speicherplatz wirklich 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 danach bitte einen Augenblick …"
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Exportiere Verlauf …"
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, 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:570
+#: ../src/history_manager.py:579
 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:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583
+#: ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Dies ist ein unwiderruflicher Vorgang."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 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?"
 msgstr[1] "Möchten Sie die ausgewählten Nachrichten wirklich löschen?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Unterhaltungs-Verlauf mit %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Festplattenfehler"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ist jezt %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Fehlermeldung: %s"
+msgstr "Fehler: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Fehler:"
+msgstr "Fehler"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Der Status ist jetzt: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Der Status ist jetzt: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513
+#: ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Sie sind nicht mit dem Server verbunden."
+msgstr "Sie sind dabei verschiedene Tabs zu schließen"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
+msgstr "Möchten Sie wirklich alle schließen?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Chatraum"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- Nachrichten werden aufgezeichnet"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- Nachrichten werden nicht aufgezeichnet"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s änderte seinen Status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Einzelne neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Neue private Nachricht aus dem Chatraum %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Empfange Profil …"
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110
+#: ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113
+#: ../src/roster_window.py:2848
 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:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127
+#: ../src/profile_window.py:143
+#: ../src/roster_window.py:2850
+#: ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informationen empfangen"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
-msgstr ""
-"Sie müssen angemeldet sein, um Kontaktinformationen veröffentlichen zu "
-"können."
+msgstr "Sie müssen angemeldet sein, um Kontaktinformationen veröffentlichen zu können."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Sende Profil …"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informationen NICHT veröffentlicht"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 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 erneut."
+#: ../src/profile_window.py:362
+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:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280
+#: ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt Ihren Status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
-msgstr ""
-"Wenn \"%s\" diese Anfrage akzeptiert, können Sie seinen/ihren Status sehen."
+msgstr "Wenn \"%s\" diese Anfrage akzeptiert, können Sie seinen/ihren Status sehen."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG ist nicht benutzbar"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
+
+#: ../src/roster_window.py:2148
+#: ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-msgstr ""
-"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:2149
+#: ../src/roster_window.py:3395
+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:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "Nicht synchronisiert"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Gajim wirklich beenden?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
+msgstr "Möchten Sie Gajim wirklich verlassen?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Gajim immer schließen"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2351
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled and contact is in your roster."
-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:2334
+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:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Der Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:2592
-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:2581
+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:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, 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 über diese Transporte "
-"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"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
-msgstr ""
-"Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
-"fortfahren?"
+msgstr "Sie sind dabei, einen Kontakt zu blockieren. Wollen Sie wirklich fortfahren?"
 
-#: ../src/roster_window.py:2664
-msgid ""
-"This contact will see you offline and you will not receive messages he will "
-"send you."
-msgstr ""
+#: ../src/roster_window.py:2655
+msgid "This contact will see you offline and you will not receive messages he will send you."
+msgstr "Der Kontakt wird Sie als offline sehen und Sie werden von ihm keine Nachrichten empfangen, die er Ihnen sendet."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, 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:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, 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:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, 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:2800
+#: ../src/roster_window.py:2793
 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:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, 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"
+msgstr "Sie sind dabei, \"%(name)s\" (%(jid)s) aus der Kontaktliste zu entfernen.\n"
 
-#: ../src/roster_window.py:3210
-msgid ""
-"By removing this contact you also remove authorization resulting in him or "
-"her always seeing you as offline."
-msgstr ""
-"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:3217
+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:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortsetzen?"
 
-#: ../src/roster_window.py:3219
-msgid ""
-"By removing this contact you also by default remove authorization resulting "
-"in him or her always seeing you as offline."
-msgstr ""
-"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:3226
+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:3222
+#: ../src/roster_window.py:3229
 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:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, 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:3286
-#, fuzzy
-msgid ""
-"You are about to send a custom status. Are you sure you want to continue?"
-msgstr ""
-"Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
-"fortfahren?"
+#: ../src/roster_window.py:3295
+msgid "You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Sie sind dabei, einen speziellen Status zu senden. Wollen Sie wirklich fortfahren?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
-msgid ""
-"This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
-msgstr ""
+msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he will see your global status."
+msgstr "Der Kontakt wird Sie vorläufig als %(status)s sehen, aber nur bis Sie Ihren Status ändern. Dann wird er Ihren globalen Status sehen."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 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:3877
+#: ../src/roster_window.py:3897
 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:3879
-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:3899
+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:3964
-msgid ""
-"You are about to create a metacontact. Are you sure you want to continue?"
-msgstr ""
-"Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
-"fortfahren?"
+#: ../src/roster_window.py:3984
+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:3966
-msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generally it "
-"is used when the same person has several Jabber accounts or transport "
-"accounts."
-msgstr ""
-"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:3986
+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:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Wollen Sie die Datei an %s senden?"
 msgstr[1] "Wollen Sie die Dateien an %s senden?"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Sende %s"
+msgstr "Sende %s an %s"
 
-#: ../src/roster_window.py:4213
-#, fuzzy, python-format
+#: ../src/roster_window.py:4233
+#, python-format
 msgid "Make %s and %s metacontacts"
-msgstr "Sendet dem Kontakt eine Datei"
+msgstr "%s und %s zu Metakontakt zusammenführen"
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718
+#: ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798
+#: ../src/statusicon.py:248
+#: ../src/statusicon.py:295
+#: ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "über das Konto %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "an das Konto %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "über das Konto %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847
+#: ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Gespeicherte Chaträume …"
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "des Kontos %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "für das Konto %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963
+#: ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Dienste konfigurieren …"
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153
+#: ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Befehl ausführen …"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Transport verwalten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Ändern"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Verbindung trennen"
+msgstr "Wieder ve_rbinden"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Chatraum betreten …"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht …"
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Warte auf Ergebnisse"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132
+#: ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Fehler im empfangenen Datenformular"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166
+#: ../src/search_window.py:202
 msgid "No result"
 msgstr "Kein Ergebnis"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Thema: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429
+#: ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Bestätigen Sie diese Sitzungsoptionen"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9878,7 +9280,7 @@ msgstr ""
 "\n"
 "\t\tSind diese Einstellungen akzeptabel?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9893,116 +9295,121 @@ msgstr ""
 "\n"
 "Mit der Sitzung fortfahren?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht …"
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347
+#: ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350
+#: ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dieses Chatraums"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [blockiert]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [minimiert]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474
+#: ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Letzter Status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " seit %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Musiktitel:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664
+#: ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670
+#: ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?Transferstatus:Pausiert"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10010,88 +9417,116 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich veraltet oder defekt"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Unbekannt"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
 msgstr "?Time:Unbekannt"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299
+#: ../src/vcard.py:309
+#: ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Mitgliedschaft:</b>"
 
-#: ../src/vcard.py:339
-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:344
+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:341
-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:346
+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:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Sie und der Kontakt sind am Status des Anderen interessiert"
 
 #. None
-#: ../src/vcard.py:345
-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:350
+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:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
-msgstr ""
-"Sie warten auf die Antwort des Kontaktes bezüglich Ihrer Abonnement-Anfrage"
+msgstr "Sie warten auf die Antwort des Kontaktes bezüglich Ihrer Abonnement-Anfrage"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Es gibt keine offenen Abonnementanfragen."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364
+#: ../src/vcard.py:418
+#: ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Eingehende Nachricht:"
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Ausgehende Nachricht:"
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+#~ 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."
+
+# TODO: GPG/PGP unification in original strings needed
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Keine OpenPGP-Passphrase gewählt."
+#~ 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."
+#~ 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."
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Diese Nachricht ist verschlüsselt]"
+#~ msgid "%i days ago"
+#~ msgstr "Vor %i Tagen"
+#~ msgid "Trayicon"
+#~ msgstr "Tray-Symbol"
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Ein Symbol im Systemtray, das den Status widerspiegelt."
+#~ 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"
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Erforder PyGTK >= 2.10."
 #~ msgid "Add Special _Notification"
 #~ msgstr "Spezielle Be_nachrichtigung hinzufügen"
-
 # TODO: GPG/PGP unification in original strings needed
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Open_PGP-Schlüssel zuweisen"
-
 #~ msgid "Command not supported for zeroconf account."
 #~ msgstr "Der Befehl für das Zeroconf-Konto wird nicht unterstützt."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Befehle: %s"
-
 #~ msgid "Usage: /%s, clears the text window."
 #~ msgstr "Verwendung: /%s, leert das Textfenster."
-
 #~ msgid "Usage: /%s, hide the chat buttons."
 #~ msgstr "Verwendung: /%s, versteckt die Chatschaltflächen."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10099,28 +9534,20 @@ msgstr " Resource mit Priorität "
 #~ "Verwendung: /%(command)s <Aktion>, sendet eine Aktion an den aktuellen "
 #~ "Chatraum. Verwenden Sie die Person Singular, z.B. mit /%(command)s kratzt "
 #~ "sich am Kinn)."
-
 #~ msgid "Usage: /%s, sends a ping to the contact"
 #~ msgstr "Verwendung: /%s, sendet einen Ping zum Kontakt."
-
 #~ msgid "Usage: /%s, send the message to the contact"
 #~ msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Keine Hilfe vorhanden für /%s."
-
 #~ msgid "Enable link-local/zeroconf messaging"
 #~ msgstr "Aktiviere Anzeige von Kontakten im LAN über Zeroconf."
-
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Spitzname nicht gefunden: %s"
-
 #~ msgid "This group chat has no subject"
 #~ msgstr "Dieser Chatraum hat kein Thema"
-
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
-
 #, fuzzy
 #~ msgid "Nickname not found"
 #~ msgstr "Spitzname nicht gefunden: %s"
@@ -10136,28 +9563,24 @@ msgstr " Resource mit Priorität "
 #~ "wenn er kein \"@\" enthält. Wenn die Jabber-ID derzeit im Chatraum ist, "
 #~ "wird sie zusätzlich herausgeworfen. Leerzeichen im Spitznamen werden "
 #~ "nicht unterstützt."
-
 #~ msgid ""
 #~ "Usage: /%s <nickname>, opens a private chat window with the specified "
 #~ "occupant."
 #~ msgstr ""
 #~ "Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit "
 #~ "dem Inhaber des angegebenen Spitznamens."
-
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
 #~ "Verwendung: /%s [Grund], schließt das aktuelle Fenster oder den aktuellen "
 #~ "Tab, optional mit der Angabe eines Grundes."
-
 #~ msgid ""
 #~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
 #~ "optionally providing a reason."
 #~ msgstr ""
 #~ "Verwendung: /%s <Jabber-ID> [Grund], lädt die Jabber-ID in den aktuellen "
 #~ "Chatraum ein, optional mit der Angabe eines Grundes."
-
 #~ msgid ""
 #~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
 #~ "optionally using specified nickname."
@@ -10173,7 +9596,6 @@ msgstr " Resource mit Priorität "
 #~ "Verwendung: /%s <Spitzname> [Grund], entfernt den Inhaber des angegebenen "
 #~ "Spitznamens aus dem Chatraum, optional mit Grund. Leerzeichen im "
 #~ "Spitznamen werden nicht unterstützt."
-
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
 #~ "message to the occupant specified by nickname."
@@ -10181,20 +9603,16 @@ msgstr " Resource mit Priorität "
 #~ "Verwendung: /%s <Spitzname> [Nachricht], öffnet ein privates "
 #~ "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
 #~ "Spitznamens."
-
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr ""
 #~ "Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
-
 #~ msgid "Usage: /%s , display the names of group chat occupants."
 #~ msgstr "Verwendung: /%s, zeigt die Namen der Teilnehmer im Chatraum an."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
 #~ "Verwendung: /%s [topic], zeigt oder aktualisiert das derzeitige Chatraum-"
 #~ "Thema."
-
 #~ msgid ""
 #~ "Usage: /%s <message>, sends a message without looking for other commands."
 #~ msgstr ""
@@ -10207,62 +9625,46 @@ msgstr " Resource mit Priorität "
 #~ "messages."
 #~ msgstr ""
 #~ "Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
-
 #~ msgid "B_OSH Port:"
 #~ msgstr "B_OSH-Port:"
-
 #~ msgid "Show _roster"
 #~ msgstr "_Kontaktliste anzeigen"
-
 #~ msgid "Modify Account"
 #~ msgstr "Konto bearbeiten"
-
 #~ msgid "Use _custom port:"
 #~ msgstr "Verwende _benutzerdefinierten Port:"
-
 #~ msgid ""
 #~ "%(title)s by %(artist)s\n"
 #~ "from %(source)s"
 #~ msgstr ""
 #~ "%(title)s von %(artist)s\n"
 #~ "aus %(source)s"
-
 #~ msgid "Always use OS/X default applications"
 #~ msgstr "Immer OS/X-Standardprogramme verwenden"
-
 #~ msgid "Custom"
 #~ msgstr "Benutzerdefiniert"
-
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Die Gegenseite hat Dateiübertragung gestoppt"
-
 #~ msgid "Generic"
 #~ msgstr "Allgemein"
-
 #~ msgid "Mood"
 #~ msgstr "Stimmung"
-
 #~ msgid "Activity"
 #~ msgstr "Aktivität"
-
 #~ msgid "Your JID:"
 #~ msgstr "Ihre Jabber-ID:"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Doppelte Jabber-ID"
-
 #~ msgid "This account is already configured in Gajim."
 #~ msgstr "Dieser Kontakt wurde bereits konfiguriert."
-
 #~ 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."
-
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim-Konto %s"
-
 #~ msgid "Name:"
 #~ msgstr "_Name:"
+
diff --git a/po/el.po b/po/el.po
index 46043b2d2..644f5f455 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-19 23:46+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team:  <>\n"
@@ -296,9 +296,9 @@ msgstr "Τροποποίηση προσωπικών πληροφοριών..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -307,9 +307,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Γενικά"
 
@@ -371,21 +371,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύονται στο διακομιστή"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Δεν έχει επιλεχτεί κλειδί"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Κανένα"
 
@@ -544,8 +544,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -559,7 +559,7 @@ msgid "Mer_ge accounts"
 msgstr "Συ_γχώνευση λογαριασμών"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "_Μετονομασία"
 
@@ -974,7 +974,7 @@ msgstr "Τελευταία τροποποίηση:"
 msgid "New entry received"
 msgstr "Προσθήκη νέας εγγραφής στο μενού"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 #, fuzzy
 msgid "You have received new entry:"
 msgstr "Προσθήκη νέας εγγραφής στο μενού"
@@ -1023,12 +1023,12 @@ msgstr "Εισάγετε νέο κωδικό πρόσβασης:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Εισάγετε το νέο μήνυμα κατάστασης</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Ενεργό"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Δωμάτιο:"
@@ -1124,8 +1124,8 @@ msgstr "Επεξεργασία _ομάδων"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 #, fuzzy
 msgid "In_vite to"
 msgstr "Αδυναμία φόρτωσης"
@@ -1141,8 +1141,8 @@ msgid "Remo_ve"
 msgstr "_Αφαίρεση"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
@@ -1179,8 +1179,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1192,7 +1192,7 @@ msgstr "Απαγόρευσε τον/την να βλέπει την κατάστ
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Ιστορικό"
 
@@ -1215,8 +1215,8 @@ msgid "_Subscription"
 msgstr "_Συνδρομή"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
@@ -1312,7 +1312,7 @@ msgstr ""
 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:820
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
@@ -1320,7 +1320,7 @@ msgstr "_Συνέχεια"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
@@ -1349,7 +1349,7 @@ msgstr ""
 "Επαφή\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Έντονα"
 
@@ -1369,11 +1369,11 @@ msgstr "Προσαρμογή θεμάτων Gajim"
 msgid "Gone"
 msgstr "Έξω"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Ανενεργό"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Πλάγια"
 
@@ -1424,7 +1424,7 @@ msgstr "Αλλαγή _θέματος"
 msgid "Configure _Room..."
 msgstr "Ρύθμιση _δωματίου"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
@@ -1524,8 +1524,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Διαχειριστής βάσης δεδομένων ιστορικού Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -1550,7 +1551,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Αναζήτηση στη βάση δεδομένων"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Ιστορικό συζητήσεων"
 
@@ -1576,7 +1577,7 @@ msgstr "_Καταγραφή ιστορικού συζητήσεων"
 msgid "Bookmark this room"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
@@ -1604,8 +1605,8 @@ msgstr "Πρόσφατα:"
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
@@ -1635,7 +1636,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Εμφάνιση κατάστασης:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Εξυπηρετητής:"
 
@@ -1759,17 +1760,26 @@ msgid "Show a list of formattings"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Αποστολή"
 
@@ -1912,6 +1922,16 @@ msgid "Configure color and font of the interface"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Μήνυμα κατά_στασης:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Όνομα επαφής"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1920,34 +1940,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1958,7 +1978,7 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1968,7 +1988,7 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1976,12 +1996,12 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1990,26 +2010,26 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2017,7 +2037,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2025,7 +2045,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2033,7 +2053,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2041,7 +2061,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2049,14 +2069,14 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2067,20 +2087,20 @@ msgstr ""
 "ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει "
 "όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2090,13 +2110,13 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2104,108 +2124,108 @@ msgstr ""
 "Αν δεν απενεργοποιηθεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το "
 "':)' με τις αντίστοιχες γραφικές φατσούλες"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Παρά_θυρο ενός μηνύματος:"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Δια_χείριση..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "Προσωπικές πληροφορίες"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Προβολή τίτλου στο κουμπί"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "Style"
 msgstr "Πάγωσε"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Θέμα:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2213,7 +2233,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2221,114 +2241,116 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "Use system _default"
 msgstr "Χρήση _προκαθορισμένου χρώματος"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Μήνυμα σφάλματος: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Π_ριν το ψευδώνυμο:"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Φατσούλες:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Διαχειριστής αρχείων:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Εισερχόμενο μήνυμα:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Εφαρμογή αλληλογραφίας:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Άνοιγμα..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Ε_ξερχόμενο μήνυμα:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -2386,7 +2408,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Σειρά:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr ""
 
@@ -2550,7 +2572,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Ιδιότητες</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Ιστορικό</b>"
@@ -2614,8 +2636,8 @@ msgstr "Αφαίρεση λογαριασμού από το Gajim και από
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
@@ -2634,14 +2656,14 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Διαγραφή"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_Εντάξει"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr "Διαγραφή"
 
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
@@ -2704,7 +2726,7 @@ msgstr "_Ενέργειες"
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
@@ -2748,12 +2770,12 @@ msgid "_Add contact"
 msgstr "Προσθήκη _επαφής"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 #, fuzzy
 msgid "_Information"
 msgstr "Πληροφορίες επαφής"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Αναζήτηση"
 
@@ -2773,10 +2795,6 @@ msgstr "Εγγραφή σε"
 msgid "_Cancel"
 msgstr "_Άκυρο"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_Εντάξει"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2998,332 +3016,316 @@ msgstr "Πόρος:"
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Ενεργό"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Ανενεργό"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Ακέραιος"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Χρώμα"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Όνομα προτίμησης"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Τιμή"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Είδος"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Κενή)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Μυστικό"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Προσθήκη νέας εγγραφής στο μενού"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Προσθήκη νέας εγγραφής στο μενού"
+msgstr[1] "Προσθήκη νέας εγγραφής στο μενού"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Αγγλικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Βουλγαρικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Τσέχικα"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Γερμανικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Εληνικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Βρετανικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Εσπεράντο"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Ισπανικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Γαλλικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Κροατικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Ιταλικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Νορβηγικά (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Ολλανδικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Νορβηγικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Πολωνέζικα"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Πορτογαλικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Πορτογαλικά Βραζιλίας"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Ρώσικα"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Serbian"
 msgstr "Γερμανικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Σλοβάκικα"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Σουηδικά"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Κινέζικα (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "Υπογράμμιση"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Ψευδώνυμο"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "_Γραμματοσειρά:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-#, fuzzy
-msgid "Unknown Artist"
-msgstr "Άγνωστος τύπος %s "
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-#, fuzzy
-msgid "Unknown Title"
-msgstr "Άγνωστος τύπος %s "
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-#, fuzzy
-msgid "Unknown Source"
-msgstr "Άγνωστος τύπος %s "
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "Χρήση πιστοποίησης"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Χρήση πιστοποίησης"
@@ -3331,58 +3333,58 @@ msgstr "Χρήση πιστοποίησης"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3390,22 +3392,22 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
@@ -3414,23 +3416,23 @@ msgstr "Ο %(nick)s είναι τώρα %(status)s"
 msgid "creating logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Το Gajim τώρα θα κλείσει"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "δημιουργία φακέλου %s"
@@ -3495,10 +3497,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 #, fuzzy
 msgid "Groupchats"
 msgstr "Ομαδικές συζητήσεις"
@@ -3618,9 +3620,9 @@ msgstr ""
 "συμπτυχθεί"
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 #, fuzzy
 msgid "default"
 msgstr "Προεπιλογή"
@@ -4216,7 +4218,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Ειδική παράκαμψη για το jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4225,126 +4227,126 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'ναι', 'όχι', ή 'και τα δύο'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'ναι', 'όχι' ή ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Είμαι διαθέσιμος."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Είμαι ελεύθερος για κουβέντα."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Δεν είμαι διαθέσιμος."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Μην ενοχλείτε."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Γεια χαρά!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4353,109 +4355,108 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "θαλασσί"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Λάθος διακομιστής"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
 "%s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
@@ -4463,77 +4464,77 @@ msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Δεν είστε στη λίστα μελών."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4672,187 +4673,184 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Θέμα: %s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Επανασύνδεση χειροκίνητα."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Μη έγκυρη απόκριση"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Θέμα: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Επαφές"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Παρατηρητές"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 #, fuzzy
 msgid "Not in roster"
 msgstr "Εκτέλεση στο Τερματικό"
@@ -5103,7 +5101,7 @@ msgstr "Διαθέσιμος για κουβέντα"
 msgid "_Available"
 msgstr "_Διαθέσιμος"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Διαθέσιμος"
 
@@ -5222,77 +5220,77 @@ msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Αποστολή μηνύματος"
 msgstr[1] "Αποστολή μηνύματος"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5308,16 +5306,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "κυανό"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
@@ -5327,709 +5325,731 @@ msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 msgid "XMPP account %s@%s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "Παύση"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Έντονα"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Brave"
 msgstr "Έχει"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Συζητήσεις"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Έντονα"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Περιεχόμενα"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Περιεχόμενα"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Ανενεργό"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 #, fuzzy
 msgid "Curious"
 msgstr "_Πίσω"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Διαγραφή"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Disappointed"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Dismayed"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Distracted"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Envious"
 msgstr "_Πίσω"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Excited"
 msgstr "Ενεργό"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Ομάδα"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "Ε_ξυπηρετητής:"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "μήνυμα"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Ενεργό"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Αφανής"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "ένα"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "Ε_ξυπηρετητής:"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Γερμανικά"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "_Τροποποίηση"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 #, fuzzy
 msgid "Nervous"
 msgstr "_Πίσω"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Ομάδα"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "έντεκα"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "Πάγωσε"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "Τελευταία τροποποίηση:"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Serious"
 msgstr "_Πίσω"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Οδός:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Εγγεγραμμένος"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Χρόνος"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "Υπογράμμιση"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Λάθος διακομιστής"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Απόγευμα"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "Σύνθεση"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "Πρωί"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "όλους στην ομάδα"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Απόγευμα"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "_Συμμετοχή"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Grooming"
 msgstr "Από"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 #, fuzzy
 msgid "Relaxing"
 msgstr "λιτό"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "Αιτία"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Αιτία"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "Μεταφέρεται"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "Σύνθεση"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 #, fuzzy
 msgid "On a Plane"
 msgstr "Συνδεδεμένος"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 #, fuzzy
 msgid "On a Train"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "Σύνθεση"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "Δουλειά"
 
+#: ../src/common/pep.py:335
+#, fuzzy
+msgid "Unknown Artist"
+msgstr "Άγνωστος τύπος %s "
+
+#: ../src/common/pep.py:338
+#, fuzzy
+msgid "Unknown Title"
+msgstr "Άγνωστος τύπος %s "
+
+#: ../src/common/pep.py:341
+#, fuzzy
+msgid "Unknown Source"
+msgstr "Άγνωστος τύπος %s "
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, fuzzy, python-format
@@ -6049,88 +6069,56 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Δε δόθηκε φράση πρόσβασης για το OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
-"επανασυνδεθείτε."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Σφάλμα avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6141,100 +6129,100 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Νέα είσοδος τώρα;"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
 "γεγονότα."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6242,154 +6230,154 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 #, fuzzy
 msgid "Rename Account"
 msgstr "Διαχείριση λογαριασμών"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Σφάλμα κατά τη λήψη των μυστικών κλειδιών OpenPGP σας."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το κλειδί OpenPGP σας"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6397,11 +6385,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6409,11 +6397,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6422,11 +6410,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6434,7 +6422,7 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6451,61 +6439,62 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Είσοδος και έξοδος μόνο"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6513,31 +6502,31 @@ msgstr ""
 "αφαιρέστε το σελιδοδείκτη."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 #, fuzzy
 msgid "Invalid server"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6548,36 +6537,36 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6587,7 +6576,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6595,74 +6584,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Ενεργό"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6671,126 +6660,123 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Έξοδος"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Α_ναζήτηση για:"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Λείπει ένα \"%s\" από το URL του λεξικού και δεν είναι WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Χθες"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "πριν από %i μέρες"
+msgid_plural "%i days ago"
+msgstr[0] "Χθες"
+msgstr[1] "Χθες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Όνομα εικονιδίου"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID συστήματος:"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "Ταυτότητα κλειδιού"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ορισμός MOTD"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για κατάσταση %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6798,108 +6784,108 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Αποθήκευση ως προκαθορισμένο μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 #, fuzzy
 msgid "AIM Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 #, fuzzy
 msgid "GG Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 #, fuzzy
 msgid "ICQ Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 #, fuzzy
 msgid "MSN Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 #, fuzzy
 msgid "User ID:"
 msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Έκδοση GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Έκδοση PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Δημιουργοί:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Τέλος, θα θέλαμε να ευχαριστήσουμε όλους τους διαχειριστές πακέτων."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -6907,7 +6893,7 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg@hellug.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6916,44 +6902,44 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
@@ -6961,69 +6947,74 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr ""
+"Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7033,304 +7024,333 @@ msgstr ""
 "την οποία θέλετε να στείλετε ένα μήνυμα συζήτησης:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Μη έγκυρο JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Δεν ήταν δυνατή η ανάγνωση του \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Νέο μονό μήνυμα"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Η επαφή άλλαξε κατάσταση"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Από %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Πάγωσε"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "_Τροποποίηση"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Αφαίρεση"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Ομάδα"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Προσθήκη _επαφής"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
+
+#: ../src/dialogs.py:3229
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "backdrops.list"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Εικονίδια δράσεων"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Κατάσταση"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "όταν είμαι"
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7338,38 +7358,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7379,31 +7399,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Άλλα"
@@ -7413,24 +7452,24 @@ msgstr "Άλλα"
 msgid "Conference"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7438,344 +7477,339 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Περιήγηση"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Εκτέλεση εντολής..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Περιγραφή"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 #, fuzzy
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
 "κεντρικό παράθυρο."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Εγγεγραμμένος"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Κόμβος"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 #, fuzzy
 msgid "New post"
 msgstr "_Νέα λίστα..."
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Εντολές: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "_Εισερχόμενο μήνυμα:"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Αδυναμία φόρτωσης"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "_Εισερχόμενο μήνυμα:"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Γενικά"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "Χαρακτηριστικά διακομιστή"
@@ -7792,109 +7826,109 @@ msgstr "Χρόνος"
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Mέγεθος: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Άνοιγμα αρχείου μενού"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Παραλήπτης: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Περιγραφή: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Το Gajim δεν έχει πρόσβαση σε αυτό το αρχείο"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Αυτό το αρχείο χρησιμοποιείται από άλλη διεργασία."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Αρχείο: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Δεν είναι δυνατή η αντικατάσταση του υπάρχοντος αρχείου \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7902,33 +7936,33 @@ msgstr ""
 "Ένα αρχείο με αυτό το όνομα υπάρχει ήδη και δε μπορείτε να το "
 "αντικαταστήσετε."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Δεν είναι δυνατή η εγγραφή στον κατάλογο \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Δε μπορείτε να δημιουργήσετε αρχεία σε αυτό τον κατάλογο."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7936,32 +7970,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/δεπτ)"
 
-#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Αρχείο:"
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Παύση"
 
@@ -8030,11 +8064,11 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8042,437 +8076,30 @@ msgstr ""
 "Φαίνεται πως εκτελείται ήδη μια διεργασία του Gajim.\n"
 "Σίγουρα να εκτελεστεί;"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Απαιτείται φράση πρόσβασης"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Εσφαλμένη φράση πρόσβασης"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
-"Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Δέχεστε αυτό το αίτημα;"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Δέχεστε αυτό το αίτημα;"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Η σύνδεση απέτυχε"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Αίτηση εγγραφής"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Λήψη εξουσιοδότησης"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Εγγραφή"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "Ο %s είναι τώρα γνωστός ως %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "Ο %(nick)s είναι τώρα %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "H φράση πρόσβασης είναι λανθασμένη"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "H φράση πρόσβασης είναι λανθασμένη"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Μη_ν με ξαναρωτήσεις"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/gajim.py:1681
-#, fuzzy, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, fuzzy, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Έχετε %d νέο μήνυμα ηλεκτρονικής αλληλογραφίας"
-msgstr[1] "Έχετε %d νέα μηνύματα ηλεκτρονικής αλληλογραφίας"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "Σε κάθε _μήνυμα"
-
-#: ../src/gajim.py:2042
-#, fuzzy
-msgid "Username Conflict"
-msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
-
-#: ../src/gajim.py:2043
-#, fuzzy
-msgid "Please type a new username for your local account"
-msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-#, fuzzy
-msgid "Error."
-msgstr "Σφάλμα:"
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Σύνδεση"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
-"άλλες επαφές."
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-#, fuzzy
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "εμφανίζει βοήθεια για μια συγκεκριμένη εντολή"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "εντολή"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "εμφάνιση βοήθειας στην εντολή"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8481,51 +8108,51 @@ msgstr ""
 "Εμφανίζει όλες τις επαφές στη λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια "
 "ξεχωριστή γραμμή"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "λογαριασμός"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "εμφάνιση μόνο των επαφών του συγκεκριμένου λογαριασμού"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Εμφανίζει τη λίστα των καταχωρημένων λογαριασμών"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "κατάσταση"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "μήνυμα"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "μήνυμα κατάστασης"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8534,22 +8161,22 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Π_ροτεραιότητα:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8559,27 +8186,27 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Εμφανίζει το διαλόγο κουβέντας ώστε να μπορείτε να στέλνετε μηνύματα σε μια "
 "επαφή"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του "
 "λογαριασμού"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8591,31 +8218,31 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "κλειδί pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο "
 "κλειδί"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8627,226 +8254,226 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "θέμα"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "θέμα μηνύματος"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για ένα λογαριασμό"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Όνομα λογαριασμού"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "αρχείο"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "εάν οριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του "
 "έχει προσδιοριστεί"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "κλειδί"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Προσθέτει μια νέα επαφή σε αυτό το λογαριασμό."
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 #, fuzzy
 msgid "Opens 'Start Chat' dialog"
 msgstr "Άνοιγμα του διαλόγου 'Έναρξη κουβέντας'"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Έναρξη κουβέντας με χρήση αυτού του λογαριασμού"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 #, fuzzy
 msgid "Sends custom XML"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 #, fuzzy
 msgid "XML to send"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Σύνδεση σε νέο δωμάτιο"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "room"
 msgstr "Από"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Δωμάτιο:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "κωδικός πρόσβασης"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8855,31 +8482,31 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8888,7 +8515,7 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8897,7 +8524,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8906,7 +8533,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
@@ -8937,175 +8564,199 @@ msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντ
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "Ιστορικό συζητήσεων"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Σύνδεση"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, 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:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "Ο %s είναι τώρα γνωστός ως %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Συσχέτιση: "
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "Ο %(nick)s είναι τώρα %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Μη_ν με ξαναρωτήσεις"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -9131,22 +8782,22 @@ msgid "Details"
 msgstr "<b>Λεπτομέρειες</b>"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -9154,41 +8805,434 @@ msgstr ""
 "συνεδριών"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Θέλετε να αντικατασταθεί;"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Η εικόνα δεν είναι δυνατό να αποθηκευτεί στη μορφή %(type)s. Να αποθηκευτεί "
 "ως %(new_filename)s;"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Αποθήκευση εικόνας ως..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
+"Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Δέχεστε αυτό το αίτημα;"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Δέχεστε αυτό το αίτημα;"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Η σύνδεση απέτυχε"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Αίτηση εγγραφής"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Λήψη εξουσιοδότησης"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Εγγραφή"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "H φράση πρόσβασης είναι λανθασμένη"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "H φράση πρόσβασης είναι λανθασμένη"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:1292
+#, fuzzy, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Έχετε %d νέο μήνυμα ηλεκτρονικής αλληλογραφίας"
+msgstr[1] "Έχετε %d νέα μηνύματα ηλεκτρονικής αλληλογραφίας"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Σε κάθε _μήνυμα"
+
+#: ../src/gui_interface.py:1657
+#, fuzzy
+msgid "Username Conflict"
+msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
+
+#: ../src/gui_interface.py:1658
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+#, fuzzy
+msgid "Error."
+msgstr "Σφάλμα:"
+
+#: ../src/gui_interface.py:1721
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Αίτηση μεταφοράς αρχείου"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Σύνδεση"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Απαιτείται φράση πρόσβασης"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Εσφαλμένη φράση πρόσβασης"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
@@ -9203,7 +9247,7 @@ msgstr "Επαφές"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -9214,7 +9258,7 @@ msgstr "Όνομα χρήστη"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Μήνυμα"
 
@@ -9240,16 +9284,16 @@ msgstr ""
 "\n"
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Εξαγωγή ιστορικού..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] ""
@@ -9257,187 +9301,187 @@ msgstr[0] ""
 msgstr[1] ""
 "Θέλετε σίγουρα να διαγράψετε τα αρχεία καταγραφής των επιλεγμένων επαφών;"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 msgstr[1] "Θέλετε σίγουρα να διαγράψετε τα επιλεγμένα μηνύματα;"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Ιστορικό κουβέντας με τον %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 #, fuzzy
 msgid "Disk Error"
 msgstr "Σφάλμα:"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "Ο/Η %(nick)s είναι τώρα %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 #, fuzzy
 msgid "Error"
 msgstr "Σφάλμα:"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Συζητήσεις"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "Ο %(nick)s άλλαξε κατάσταση"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Σύνδεση %(nickname)s"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Αποσύνδεση %(nickname)s"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Νέο μονό μήνυμα από %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Νέο προσωπικό μήνυμα από το δωμάτιο %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "εννιά"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 #, fuzzy
 msgid "Retrieving profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 #, fuzzy
 msgid "File is empty"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 #, fuzzy
 msgid "File does not exist"
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 #, fuzzy
 msgid "Information received"
 msgstr "Περισσότερες πληροφορίες..."
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 #, fuzzy
 msgid "Sending profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 #, fuzzy
 msgid "Information NOT published"
 msgstr "Δεν ήταν δυνατή η εκτέλεση του \"%s\""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9445,47 +9489,52 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
 "δοκιμάστε αργότερα."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9493,28 +9542,28 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9523,19 +9572,19 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9544,12 +9593,12 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9558,73 +9607,73 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 #, fuzzy
 msgid "Rename Group"
 msgstr "Ιδιοκτήτης / Ομάδα"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Διαγραφή ομάδας"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9633,12 +9682,12 @@ msgstr ""
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9646,17 +9695,17 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9665,7 +9714,7 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -9673,34 +9722,34 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -9708,31 +9757,31 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 msgstr[1] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Αποστολή %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
@@ -9742,167 +9791,167 @@ msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "στο λογαριασμό %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "/Προβολή/_Διαχείριση"
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr ""
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Εύρεση _υπηρεσιών..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Σε όλους τους χρήστες"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Μετονομασία αρχείων"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _ομάδων"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Αποστολή μονού μηνύματος"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Αδυναμία εκτέλεσης της εντολής:"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Μεταφορές"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Αποσύνδεση επαφής"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Αλλαγή μηνύματος κατάστασης..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Θέμα: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9912,7 +9961,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9922,120 +9971,120 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "Αλλαγή μηνύματος _κατάστασης..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID συστήματος:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Κατάσταση: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Τελευταία κατάσταση: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr "από τις %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "Σύνδεση"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Εγγραφή: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Τύπος:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10043,30 +10092,30 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "από τις %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Εφαρμογές</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10074,7 +10123,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10082,12 +10131,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10095,18 +10144,43 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Εισερχόμενο μήνυμα:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "Ε_ξερχόμενο μήνυμα:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk+"
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Δε δόθηκε φράση πρόσβασης για το OpenPGP"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
+#~ "επανασυνδεθείτε."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
+
+#~ msgid "%i days ago"
+#~ msgstr "πριν από %i μέρες"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Προσθήκη ειδικής _γνωστοποίησης"
 
@@ -10657,9 +10731,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "A_fter nickname:"
 #~ msgstr "Με_τά από ψευδώνυμο:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "Π_ριν το ψευδώνυμο:"
-
 #~ msgid "_After time:"
 #~ msgstr "Μετά α_πό χρόνο:"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 3d8de29a3..13e209a38 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,10 +5,10 @@
 # Jeff Bailes <thepizzaking@gmail.com>, 2006, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
+"Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-19 23:48+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-11-20 20:49+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr "<b>Please select a server</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -103,9 +103,8 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Use authentication"
+msgstr "Anon_ymous authentication"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -279,9 +278,9 @@ msgstr "Edit Personal Information..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -290,9 +289,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "General"
 
@@ -352,21 +351,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Information about you, as stored in the server"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "No key selected"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "None"
 
@@ -472,18 +471,16 @@ msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
-msgstr "_Adjust to status"
+msgstr "A_djust to status"
 
 #: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Accounts"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Use authentication"
+msgstr "Anonymous authentication"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -494,9 +491,8 @@ msgstr ""
 "insecure connection."
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
-msgstr "C_onnect on Gajim startup"
+msgstr "Co_nnect on Gajim startup"
 
 #: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
@@ -523,8 +519,8 @@ msgstr ""
 "You might consider to change possible firewall settings."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -538,68 +534,57 @@ msgid "Mer_ge accounts"
 msgstr "Mer_ge accounts"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Re_name"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
-msgstr "Send keep-alive packets"
+msgstr "Send _keep-alive packets"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
-msgstr "Synch_ronise account status with global status"
+msgstr "Synchroni_se account status with global status"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use G_PG Agent"
-msgstr "Use GPG _Agent"
+msgstr "Use G_PG Agent"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
-msgstr "Use custom hostname/port"
+msgstr "Use cust_om hostname/port"
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Use custom port:"
+msgstr "Use cust_om port:"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "Edit Personal Information..."
+msgstr "_Edit Personal Information..."
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Enable"
+msgstr "_Enable"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
-msgstr "_Hostname:"
+msgstr "_Hostname: "
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Manage..."
+msgstr "_Manage..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
-msgstr "_Port:"
+msgstr "_Port: "
 
 #: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Warn before using an insecure connection"
 
 #: ../data/glade/accounts_window.glade.h:63
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
-msgstr "use HTTP_PROXY environment variable"
+msgstr "_use HTTP__PROXY environment variable"
 
 #: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
@@ -944,7 +929,7 @@ msgstr "Last modified:"
 msgid "New entry received"
 msgstr "New entry received"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "You have received new entry:"
 
@@ -988,11 +973,11 @@ msgstr "Enter new password:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Type your new status message</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Activity:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Mood:"
 
@@ -1072,9 +1057,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Assign Open_PGP Key..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Execute Command..."
+msgstr "E_xecute Command..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1082,8 +1066,8 @@ msgstr "Edit _Groups..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "In_vite to"
 
@@ -1096,8 +1080,8 @@ msgid "Remo_ve"
 msgstr "Remo_ve"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Send Cus_tom Status"
 
@@ -1130,8 +1114,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Allow him/her to see my status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Block"
 
@@ -1142,7 +1126,7 @@ msgstr "_Forbid him/her to see my status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_History"
 
@@ -1163,8 +1147,8 @@ msgid "_Subscription"
 msgstr "_Subscription"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Unblock"
 
@@ -1252,7 +1236,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Show a pop-up notification when a file transfer is complete "
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Continue"
 
@@ -1260,7 +1244,7 @@ msgstr "_Continue"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notify me when a file transfer is complete"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Open Containing Folder"
 
@@ -1288,7 +1272,7 @@ msgstr ""
 "Contact row\n"
 "Chat Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Bold"
 
@@ -1308,11 +1292,11 @@ msgstr "Gajim Themes Customisation"
 msgid "Gone"
 msgstr "Gone"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactive"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Italic"
 
@@ -1360,7 +1344,7 @@ msgstr "Change _Subject..."
 msgid "Configure _Room..."
 msgstr "Configure _Room..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Bookmark"
 
@@ -1448,8 +1432,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Delete"
 
@@ -1479,7 +1464,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Search Database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Conversation History"
 
@@ -1503,11 +1488,10 @@ msgid "_Log conversation history"
 msgstr "_Log conversation history"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "Bookmark this room (Ctrl+B)"
+msgstr "Bookmark this room"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
@@ -1534,8 +1518,8 @@ msgstr "Recently:"
 msgid "Room:"
 msgstr "Room:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Join"
 
@@ -1563,7 +1547,7 @@ msgstr "Minimise on Auto Join"
 msgid "Print status:"
 msgstr "Print status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1592,14 +1576,14 @@ msgid "<b>Settings</b>"
 msgstr "<b>Settings</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
 msgstr ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1610,34 +1594,28 @@ msgid "Pass_word:"
 msgstr "Pass_word:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgstr "Proxy _Host:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-#, fuzzy
 msgid "Use HTTP prox_y"
-msgstr "_Use proxy"
+msgstr "Use HTTP prox_y"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Use authentication"
+msgstr "Use proxy auth_entication"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
-#, fuzzy
 msgid "_BOSH URL:"
-msgstr "_URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Type:"
+msgstr "_Type:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
@@ -1676,22 +1654,30 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Show a list of emoticons (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
-#, fuzzy
 msgid "Show a list of formattings"
-msgstr "Show a list of emoticons (Alt+M)"
+msgstr "Show a list of formattings"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Show a menu of advanced functions (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Show the contact's profile (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Send"
 
@@ -1788,7 +1774,7 @@ msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
 #: ../data/glade/preferences_window.glade.h:26
 msgid "Allow sound when I'm _busy"
-msgstr ""
+msgstr "Allow sound when I'm _busy"
 
 #: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
@@ -1821,6 +1807,16 @@ msgid "Configure color and font of the interface"
 msgstr "Configure colour and font of the interface"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Chat message:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Contact name"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1834,31 +1830,31 @@ msgstr ""
 "Detached roster with chat grouped by account\n"
 "Detached roster with chat grouped by type"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Display _activity of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Display _extra e-mail details"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Display _tunes of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Display a_vatars of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Display m_ood of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Display status _messages of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1868,7 +1864,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "display in chat windows."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1878,7 +1874,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1886,11 +1882,11 @@ msgstr ""
 "Gajim will notify you via a pop-up window in the bottom right of the screen "
 "about contacts that just signed out"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Hide all buttons in chat windows"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1898,7 +1894,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1906,13 +1902,13 @@ msgstr ""
 "If ticked, Gajim will also include information about the sender of the new e-"
 "mails"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "If ticked, Gajim will change status to Away when the computer is unused."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1920,7 +1916,7 @@ msgstr ""
 "If ticked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1928,7 +1924,7 @@ msgstr ""
 "If ticked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1936,25 +1932,25 @@ msgstr ""
 "If ticked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the activity of contacts in the roster window"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the mood of contacts in the roster window"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the tunes of contacts in the roster window"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1964,7 +1960,7 @@ msgstr ""
 "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."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1974,7 +1970,7 @@ msgstr ""
 "with caution, because it blocks all messages from any contact that is not in "
 "the roster"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1984,7 +1980,7 @@ msgstr ""
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1992,7 +1988,7 @@ msgstr ""
 "If ticked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2002,7 +1998,7 @@ msgstr ""
 "from MSN will have the equivalent MSN icon for status online, away, busy, "
 "etc...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2010,7 +2006,7 @@ msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2018,50 +2014,53 @@ msgstr ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Log _encrypted chat session"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Ma_ke message windows compact"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Ma_nage..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Never\n"
+"Only when pending events\n"
+"Always"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Notify me about contacts that sign _in"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Notify me about contacts that sign _out"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Notify on new _GMail email"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Personal Events"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Play _sounds"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2071,24 +2070,23 @@ msgstr ""
 "Notify me about it\n"
 "Show only in roster"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
-msgstr "_Show event in systray"
+msgstr "Show systray:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Sign _in"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Sign _out"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2096,28 +2094,27 @@ msgstr ""
 "Some messages may include rich content (formatting, colours etc). If ticked, "
 "Gajim will just display the raw message text."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Sort contacts by status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Status _iconset:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Style"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "T_heme:"
 
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2125,10 +2122,11 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2136,105 +2134,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Use _transports icons"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Use system _default"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "When new event is received:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Error message: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "B_efore nickname:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "_Away after:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "_Display chat state notifications:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelt words"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore events from contacts not in the roster"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignore rich content in incoming messages"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Incoming message:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Log status changes of contacts"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "_Not available after:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Open..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Outgoing message:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Reset to Default Colours"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "_Send chat state notifications:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Status message:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "_URL highlight:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Window behaviour:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "in _group chats"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "in _roster"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutes"
 
@@ -2267,9 +2269,8 @@ msgid "All"
 msgstr "All"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "all by subscription"
+msgstr "All (including subscription)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2287,7 +2288,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Order:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Privacy List"
 
@@ -2431,7 +2432,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefix:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Role:</b>"
 
@@ -2491,8 +2492,8 @@ msgstr "Remove account from Gajim and from _server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -2501,24 +2502,25 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Message Body <currently unused, so it's hidden by default>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Roster Item Exchange"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-close"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2545,9 +2547,8 @@ msgid "Profile, A_vatar"
 msgstr "Profile, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Show _Offline Contacts"
+msgstr "Show Only _Active Contacts"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2576,7 +2577,7 @@ msgstr "_Actions"
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Edit"
 
@@ -2617,11 +2618,11 @@ msgid "_Add contact"
 msgstr "_Add contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Search"
 
@@ -2641,10 +2642,6 @@ msgstr "Register to"
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2751,9 +2748,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Client:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>State:</b>"
+msgstr "<b>Contact time:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
@@ -2852,285 +2848,266 @@ msgstr "Resource:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Cancel confirmation"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 "You are in process of executing command. Do you really want to cancel it?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Service sent malformed data"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Service changed the session identifier."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Service returned an error."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Activated"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Value"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(None)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Hidden"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "You have received new entry:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "You have received new entries (and %(count)d not displayed):"
+msgstr[1] "You have received new entries (and %(count)d not displayed):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "British"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norwegian (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Spelling language"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Your message can not be sent until you are connected."
 
-#: ../src/chat_control.py:820
-#, fuzzy
+#: ../src/chat_control.py:861
 msgid "Underline"
-msgstr "Undefined"
+msgstr "Underline"
 
-#: ../src/chat_control.py:821
-#, fuzzy
+#: ../src/chat_control.py:862
 msgid "Strike"
-msgstr "Sick"
+msgstr "Strike"
 
-#: ../src/chat_control.py:844
-#, fuzzy
+#: ../src/chat_control.py:885
 msgid "Font"
-msgstr "_Font:"
+msgstr "Font"
 
-#: ../src/chat_control.py:853
-#, fuzzy
+#: ../src/chat_control.py:894
 msgid "Clear formating"
-msgstr "Personal Information"
+msgstr "Clear formating"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Really send file?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "If you send a file to %s, he/she will know your real Jabber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG encryption enabled"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Not in Roster"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "A list of active, completed and stopped file transfers"
+msgstr "This contact does not support file transfer."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
+"You need to know the real JID of the contact to send him or her a file."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Unknown Artist"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Unknown Title"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Unknown Source"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "No GPG key assigned"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3138,50 +3115,50 @@ msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG encryption disabled"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Session WILL be logged"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Session WILL NOT be logged"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "is"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "is NOT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "will"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "will NOT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "and authenticated"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
 msgstr "and NOT authenticated"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3190,23 +3167,23 @@ msgstr ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Session negotiation cancelled"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "This session is encrypted"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr " and WILL be logged"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr " and WILL NOT be logged"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3214,25 +3191,25 @@ msgstr ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E encryption disabled"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "The following message was NOT encrypted"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "The following message was encrypted"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3240,15 +3217,15 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Database Error"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3257,7 +3234,7 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
@@ -3266,23 +3243,23 @@ msgstr "%(name)s is now %(status)s"
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is a file but it should be a directory"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
@@ -3345,10 +3322,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Groupchats"
 
@@ -3366,7 +3343,7 @@ msgstr "All unread messages have been forwarded."
 
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Play sound when user is busy"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3374,7 +3351,7 @@ msgstr "Use D-Bus and Notification-Daemon to show notifications"
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+msgstr "Show only online and free for chat contacts in roster."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3402,52 +3379,47 @@ msgstr "$S will be replaced by current status message, $T by autoxa time."
 
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
-msgstr ""
+msgstr "When to show systray icon. Can be 'never', 'on_event', 'always'."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Invalid nickname"
+msgstr "Incoming nickname colour."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Outgoing nickname colour."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Incoming text colour."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Outgoing text colour."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "status message text"
+msgstr "Status message text colour."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Invalid nickname"
+msgstr "Incoming nickname font."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Changing Nickname"
+msgstr "Outgoing nickname font."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Incoming text font."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Outgoing text font."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "status message text"
+msgstr "Status message text font."
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3456,9 +3428,9 @@ msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "default"
 
@@ -3558,17 +3530,19 @@ msgstr "How many minutes should last lines from previous conversation last."
 
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
-msgstr ""
+msgstr "How many lines to request to server when entering a groupchat."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr ""
+msgstr "How many minutes back to request logs when a entering a groupchat."
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3654,6 +3628,8 @@ 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 ""
+"Ask before closing tabbed chat window if there are controls that can lose "
+"data (chat, private chat, groupchat that will not be minimised)"
 
 #: ../src/common/config.py:192
 msgid ""
@@ -3893,22 +3869,20 @@ msgstr ""
 "string means we never show the dialogue."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Should we show the confirm metacontacts creation dialogue or not? Empty "
-"string means we never show the dialogue."
+"Should we show the confirm block contact dialogue or not? Empty string means "
+"we never show the dialogue."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Should we show the confirm metacontacts creation dialogue or not? Empty "
-"string means we never show the dialogue."
+"Should we show the confirm custom status dialogue or not? Empty string means "
+"we never show the dialogue."
 
 #: ../src/common/config.py:259
 msgid ""
@@ -3929,13 +3903,12 @@ msgstr ""
 "passwords."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
 
 #: ../src/common/config.py:262
 msgid ""
@@ -4002,29 +3975,32 @@ msgstr ""
 "is larger."
 
 #: ../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)"
 msgstr ""
-"Valid URI schemes. Only schemes in this list will be made accepted as \"real"
-"\" URI."
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 
 #: ../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 ""
+"Ask offline status message to all offline contacts when connection to an "
+"account is established. WARNING: This causes a lot of requests to be sent!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
-msgstr ""
+msgstr "If True, completion in groupchats will be like a shell auto-completion"
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4050,12 +4026,13 @@ msgstr "If enabled, restore the last status that was used."
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
+"If True, Contacts requesting authorisation will be automatically accepted."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
-msgstr "If False, you will no longer see the avatar in the chat window."
+msgstr ""
+"If False, this account will be disabled and will not appear in roster window."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4095,27 +4072,26 @@ msgstr "Space separated list of SSL errors to ignore."
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Whitespace sent after inactivity"
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "XMPP ping sent after inactivity"
 
 #: ../src/common/config.py:323
-#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
-"How many seconds to wait for the answer of keepalive packet before we try to "
-"reconnect."
+"How many seconds to wait for the answer of ping alive packet before we try "
+"to reconnect."
 
 #. yes, no, ask
 #: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4123,15 +4099,15 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Answer to receipt requests"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4139,11 +4115,11 @@ msgstr ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4151,101 +4127,101 @@ msgstr ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' or ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4253,99 +4229,97 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Wrong host"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
-msgstr "Register to %s"
+msgstr "Registration succeeded"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Registration with agent %s succeeded"
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
-msgstr "Connection Failed"
+msgstr "Registration failed"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Invisibility not supported"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
+msgstr "A message from a non-valid JID arrived, it has been ignored."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4354,7 +4328,7 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
@@ -4362,76 +4336,76 @@ msgstr "Nickname not allowed: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Maximum number of users for %s has been reached"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "You are banned from group chat %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Group chat %s does not exist."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Your registered nickname must be used in group chat %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "You are not in the members list in groupchat %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Room has been destroyed"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "You can join this room instead: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4568,77 +4542,105 @@ msgstr "Key usage does not include certificate signing"
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "It is not possible to send a message to %s, this JID is not valid."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Neither the remote presence is signed, nor a key was assigned."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "The contact's key (%s) does not match the key assigned in Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[This message is *encrypted* (See :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Subject: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s answered wrongly to register request: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unknown SSL error: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s answered wrongly to register request: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Saved in: %s"
+msgstr "Server replied: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to account %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connection with account %s has been lost. Retry connecting."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4647,7 +4649,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4656,24 +4658,24 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4682,76 +4684,43 @@ msgstr ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "It is not possible to send empty files"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Neither the remote presence is signed, nor a key was assigned."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "The contact's key (%s) does not match the key assigned in Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[This message is *encrypted* (See :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Subject: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Sent contact: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Invite _Contacts"
+msgstr "Sent contacts:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Connection Failed"
+msgstr "Unregister failed"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+msgstr "Unregistration with server %(server)s failed: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Observers"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Not in roster"
 
@@ -4767,7 +4736,7 @@ msgstr "D-Bus capabilities of Gajim cannot be used"
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus does not run correctly on this machine"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -4997,7 +4966,7 @@ msgstr "Free for Chat"
 msgid "_Available"
 msgstr "_Available"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Available"
 
@@ -5115,77 +5084,77 @@ msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message pending"
 msgstr[1] "%d messages pending"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " from room %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " from user %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " from %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d event pending"
 msgstr[1] "%d events pending"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5201,652 +5170,673 @@ msgid "%s is not a valid loglevel"
 msgstr "%s is not a valid loglevel"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
 #: ../src/common/passwords.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "of account %s"
+msgstr "XMPP account %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Afraid"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Amazed"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Amorous"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Angry"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Annoyed"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Anxious"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Aroused"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Bored"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Brave"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Calm"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Cautious"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Cold"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Confident"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Confused"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Contemplative"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Contented"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Cranky"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Crazy"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Creative"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Curious"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Dejected"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Depressed"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Disappointed"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Disgusted"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Dismayed"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Distracted"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Embarrassed"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Envious"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Excited"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Flirtatious"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustrated"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Grateful"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Grieving"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Grumpy"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Guilty"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Happy"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Hopeful"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Hot"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Humbled"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Humiliated"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Hungry"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Hurt"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Impressed"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "In Awe"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "In Love"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Indignant"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Interested"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Intoxicated"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Jealous"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Lonely"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Lost"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Lucky"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Mean"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Moody"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervous"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Offended"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Outraged"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Playful"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Proud"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Relaxed"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Relieved"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Remorseful"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Restless"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Sad"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarcastic"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Satisfied"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Serious"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Shocked"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Shy"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Sick"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontaneous"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Stressed"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Strong"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Surprised"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Thankful"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Thirsty"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Tired"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Weak"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Worried"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Doing Chores"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Buying Groceries"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Cleaning"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Cooking"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Doing Maintenance"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Doing the Dishes"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Doing the Laundry"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Gardening"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Running an Errand"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Walking the Dog"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Drinking"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Having a Beer"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Having Coffee"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Having Tea"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Having a Snack"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Having Breakfast"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Having Dinner"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Having Lunch"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Exercising"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Cycling"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Dancing"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Hiking"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Jogging"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Playing Sports"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Running"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Skiing"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Swimming"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Working out"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Grooming"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "At the Spa"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Brushing Teeth"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Getting a Haircut"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Shaving"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Taking a Bath"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Taking a Shower"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Having an Appointment"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Day Off"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Hanging out"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Hiding"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Praying"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Scheduled Holiday"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Thinking"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Relaxing"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Fishing"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Gaming"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Going out"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Partying"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Reading"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Rehearsing"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Shopping"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Smoking"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Socialising"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Sunbathing"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Watching TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Watching a Movie"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Talking"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "In Real Life"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "On the Phone"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "On Video Phone"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Travelling"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Commuting"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Driving"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "In a Car"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "On a Bus"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "On a Plane"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "On a Train"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "On a Trip"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Walking"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Coding"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "In a Meeting"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Studying"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Writing"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Unknown Artist"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Unknown Title"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Unknown Source"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5870,37 +5860,11 @@ msgstr ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passphrase was not given"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "You will be connected to %s without OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"To continue sending and receiving messages, you will need to reconnect."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5909,53 +5873,44 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[This message is encrypted]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Your message could not be sent."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5967,24 +5922,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Default Message"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5993,69 +5948,68 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
-msgstr "OpenPGP is not usable in this computer"
+msgstr "OpenPGP is not usable on this computer"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6063,145 +6017,143 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Rename Account"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for account %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "A Jabber ID must be in the form \"user@servername\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "There was a problem retrieving your OpenPGP secret keys."
+msgstr "There is no OpenPGP secret key available."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "You must create your account before editing your personal information."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Without a connection, you can not edit your personal information."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "To change the account name, you must be disconnected."
+msgstr "To disable the account, you must be disconnected."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Please rename or remove it before enabling link-local messaging."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6209,11 +6161,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6221,11 +6173,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6233,11 +6185,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6245,8 +6197,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6260,125 +6211,123 @@ msgstr ""
 "2. user@domain (any resource matches).\n"
 "3. domain/resource (only that resource matches).\n"
 "4. domain (the domain itself matches, as does any user@domain,\n"
-"domain/resource, or address containing a subdomain."
+"domain/resource, or address containing a subdomain)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Nickname not allowed: %s"
+msgstr "Character not allowed"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Invalid server"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Invalid entry"
+msgstr "Invalid room"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Please provide a server on which you want to register."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "This certificate is already in file %s, so it's not added again."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6393,7 +6342,7 @@ msgstr ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6404,63 +6353,63 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Next Message Received Focused"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Next Message Received Unfocused"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6470,7 +6419,7 @@ msgstr ""
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6478,225 +6427,221 @@ msgstr ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Quit"
+msgstr "_Quote"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Yesterday"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i days ago"
+msgid_plural "%i days ago"
+msgstr[0] "Yesterday"
+msgstr[1] "Yesterday"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber ID already in list"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "The Jabber ID you entered is already in the list. Choose another one."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Set Mood"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Overwrite Status Message?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "This name is already used. Do you want to overwrite this status message?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Please fill in the data of the contact you want to add in account %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "You cannot add yourself to your roster."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Last but not least, we would like to thank all the package maintainers."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6709,98 +6654,101 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "The nickname has not allowed characters."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Subscription request for account %(account)s from %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Invalid account name"
+msgstr "Invalid Account"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Account from which you want to enter the room"
+msgstr ""
+"You have to choose an account from which you want to join the groupchat."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Invalid Nickname"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "The group chat Jabber ID has invalid characters."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s is not the name of a group chat."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "You cannot synchronise with an account unless it is connected."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6809,300 +6757,325 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, python-format
 msgid "Form %s"
 msgstr "Form %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Console"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
-#, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "I would like to add you to my contact list."
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Sad"
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#: ../src/dialogs.py:2958
 #, fuzzy
-msgid "Add"
-msgstr "Address"
+msgid "modify"
+msgstr "Modify"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#: ../src/dialogs.py:2959
 #, fuzzy
+msgid "remove"
+msgstr "Remo_ve"
+
+#: ../src/dialogs.py:2987
+#, fuzzy, python-format
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+msgid "Add"
+msgstr "Add"
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Moody"
+msgstr "Modify"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Jabber ID:"
+msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Group"
+msgstr "Groups"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "I would like to add you to my roster."
+msgstr "%s suggested me to add you in my roster."
+
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Add contact"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Removes contact from roster"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "You must enter a name to create a privacy list."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "You are invited to a groupchat"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Do you want to accept the invitation?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7113,19 +7086,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "You have already verified this contact's identity."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Contact's identity verified"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Verify again..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7135,19 +7108,19 @@ msgstr ""
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Contact's identity NOT verified"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Verify..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Have you verified the contact's identity?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7162,22 +7135,22 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Did you talk to the remote contact and verify the SAS?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7185,7 +7158,7 @@ msgstr ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7193,6 +7166,25 @@ msgstr ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Others"
@@ -7202,24 +7194,24 @@ msgstr "Others"
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7227,239 +7219,230 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "This type of service does not contain any items to browse."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Execute Command"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "You can manage your bookmarks via Actions menu in your roster."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../src/features_window.py:46
-#, fuzzy
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
-msgstr "SSL certificate error"
+msgstr "SSL certificate validation"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "A library used to validate server certificates to ensure a secure connection."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Requires python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Serverless chatting with autodetected clients in a local network."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Requires python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Commands: %s"
+msgstr "Command line"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "A script to control Gajim via commandline."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Requires python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Feature not available under Windows."
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "Toggle Open_PGP Encryption"
+msgstr "OpenGPG message encryption"
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Encrypting chat messages with gpg keys."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Requires gpg and python-GnuPGInterface."
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
-msgstr "network-manager"
+msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Autodetection of network status."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requires gnome-network-manager and python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Session Management"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim session is stored on logout and restored on login."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Requires python-gnome2."
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Password to enter the room"
+msgstr "Password encryption"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passwords can be stored securely and not just in plaintext."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Requires gnome-keyring and python-gnome2-desktop."
+msgstr "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Ability to connect to servers which are using SRV records."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Requires dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Requires nslookup to use SRV records."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Spell Checker"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Spellchecking of composed messages."
 
-#: ../src/features_window.py:80
-#, fuzzy
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
-msgstr "Requires python-sexy."
+msgstr "Requires libgtkspell."
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
-msgstr "Notifications"
+msgstr "Notification"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Passive popups notifying for new events."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7467,51 +7450,31 @@ msgstr ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Trayicon"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "A icon in systemtray reflecting the current presence."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Requires PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
-msgstr "_Adjust to status"
+msgstr "Automatic status"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Ability to measure idle time, in order to set auto status."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
-msgstr ""
+msgstr "Requires libxss library."
 
-#: ../src/features_window.py:93
-#, fuzzy
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
-msgstr "Requires python-gnome2."
+msgstr "Requires python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transform LaTeX expressions between $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7519,7 +7482,7 @@ msgstr ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7527,25 +7490,23 @@ msgstr ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "End to End Encryption"
+msgstr "End to End message encryption"
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
-msgstr "Encrypting chatmessages."
+msgstr "Encrypting chat messages."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Requires python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7553,23 +7514,36 @@ msgstr ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Requires python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Banners and clickable links"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Ability to have clickable URLs in chat and groupchat window banners."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Requires python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Requires python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Feature"
 
@@ -7585,107 +7559,106 @@ msgstr "Time"
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Size: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
-msgstr "File Transfer Stopped"
+msgstr "File transfer stopped"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Description: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim cannot access this file"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "This file is being used by another process."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7693,33 +7666,33 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "What do you want to do?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Save File as..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7727,32 +7700,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pause"
 
@@ -7763,27 +7736,23 @@ msgstr "Gajim needs X server to run. Quiting..."
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "importing PyGTK failed: %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim needs PyGTK 2.8 or above"
+msgstr "Gajim needs PyGTK 2.12 or above"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgstr "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim needs GTK 2.8 or above"
+msgstr "Gajim needs GTK 2.12 or above"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgstr "Gajim needs GTK 2.12 or above to run. Quiting..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7822,11 +7791,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7834,463 +7803,28 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Passphrase Required"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "No GPG key assigned"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "You will be connected to %s without OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Wrong Passphrase"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Please retype your GPG passphrase or press Cancel."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Do you accept this request?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Do you accept this request on account %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Connection Failed"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Error %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "error while sending %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Subscription Request"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Authorisation accepted"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "The contact \"%s\" has authorised you to see his or her status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Contact \"%s\" removed subscription from you"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Unsubscribe"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Contact with \"%s\" cannot be established"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s is now known as %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s is now %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s has set the subject to %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Any occupant is allowed to see your full JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Room now shows unavailable member"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "room now does not show unavailable members"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "A non-privacy-related room configuration change has occurred"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Room logging is now enabled"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Room logging is now disabled"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Room is now non-anonymous"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Room is now semi-anonymous"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Room is now fully-anonymous"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "A Password is required to join the room %s. Please type it."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "You are currently connected without your OpenPGP key."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Your passphrase is incorrect"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Your passphrase is incorrect"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG is not usable"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Do _not ask me again"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "New mail on %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "You have %d new mail conversation"
-msgstr[1] "You have %d new mail conversations"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s wants to send you a file."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Removes contact from roster"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Error reading file:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "You successfully received %(filename)s from %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "File transfer of %(filename)s from %(name)s stopped."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "You successfully sent %(filename)s to %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "File transfer of %(filename)s to %(name)s stopped."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Unable to decrypt message"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Username Conflict"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Please type a new username for your local account"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Error."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Resource Conflict"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Error verifying SSL certificate"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"There was an error verifying the SSL certificate of your jabber server: %"
-"(error)s\n"
-"Do you still want to connect to this server?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignore this error for this certificate."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "SSL certificate error"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"It seems the SSL certificate 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?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Insecure connection"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Yes, I really want to connect insecurely"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "PEP node was not removed"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP node %(node)s was not removed: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Emoticons disabled"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"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."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "You cannot join a group chat while you are invisible"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Could not save your settings and preferences"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8298,49 +7832,49 @@ msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Changes the status of account or accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "message"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8348,47 +7882,43 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Changes the status of account or accounts"
+msgstr "Changes the priority of account or accounts"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Priori_ty:"
+msgstr "priority"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "I want to _register for a new account"
+msgstr "priority you want to give to the account"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"change status of account \"account\". If not specified, try to change status "
-"of all accounts that have \"sync with global status\" option set"
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Shows the chat dialogue so that you can send messages to a contact"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID of the contact that you want to chat with"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "message content. The account must be specified or \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8398,29 +7928,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp key"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8430,134 +7960,134 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sends new message to a groupchat you've joined."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID of the room that will receive the message"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8565,72 +8095,71 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI to handle"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Account in which you want to handle it"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "message contents"
+msgstr "Message content"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "Room JID"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Nickname to use"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Password to enter the room"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Account from which you want to enter the room"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Check if Gajim is running"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Shows or hides the ipython window"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8639,15 +8168,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "It seems Gajim is not running. So you can't use gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8656,16 +8185,16 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8674,7 +8203,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8683,7 +8212,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8692,7 +8221,7 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Wrong uri"
 
@@ -8721,151 +8250,175 @@ msgstr "You cannot delete your current theme"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Any occupant is allowed to see your full JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Room logging is enabled"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "The server has assigned or modified your roomnick"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s is now known as %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s has been removed from the room (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "affiliation changed"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "system shutdown"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Affiliation of %(nick)s has been set to %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Role of %(nick)s has been set to %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s is now %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "If you close this window, you will be disconnected from this group chat."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Do _not ask me again"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Destroying %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8873,22 +8426,22 @@ msgstr ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "You may also enter an alternate venue:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -8914,57 +8467,470 @@ msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: cannot open %s for reading"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Error reading file:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Error parsing file:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Could not write to %s. Session Management support will not work"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim is not the default Jabber client"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Would you like to make Gajim the default Jabber client?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Always check to see if Gajim is the default Jabber client on startup"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Always use this nickname when there is a conflict"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Do you accept this request?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Do you accept this request on account %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Connection Failed"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Error %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "error while sending %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Subscription request"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Authorisation accepted"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "The contact \"%s\" has authorised you to see his or her status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Contact \"%s\" removed subscription from you"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Unsubscribed"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Contact with \"%s\" cannot be established"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s has set the subject to %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Room now shows unavailable member"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "room now does not show unavailable members"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "A non-privacy-related room configuration change has occurred"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Room logging is now enabled"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Room logging is now disabled"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Room is now non-anonymous"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Room is now semi-anonymous"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Room is now fully-anonymous"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "A Password is required to join the room %s. Please type it."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "You are currently connected without your OpenPGP key."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Your passphrase is incorrect"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "OpenGPG Passphrase Incorrect"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG key not trusted"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "New mail on %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "You have %d new mail conversation"
+msgstr[1] "You have %d new mail conversations"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s wants to send you a file."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Remote contact stopped transfer"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Error opening file"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "You successfully received %(filename)s from %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "File transfer of %(filename)s from %(name)s stopped."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "You successfully sent %(filename)s to %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "File transfer of %(filename)s to %(name)s stopped."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Unable to decrypt message"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Username Conflict"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Please type a new username for your local account"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Error."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Resource Conflict"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s wants to send you a file."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "File Transfer Request"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Error verifying SSL certificate"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignore this error for this certificate."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "SSL certificate error"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"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?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Insecure connection"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Yes, I really want to connect insecurely"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP node was not removed"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP node %(node)s was not removed: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Emoticons disabled"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"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."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "You cannot join a group chat while you are invisible"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Could not save your settings and preferences"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Passphrase Required"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "GPG key expired"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Your GPG key has expied, you will be connected to %s without OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Wrong Passphrase"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Please retype your GPG passphrase or press Cancel."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_New Group Chat"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "I would like to add you to my roster"
 
@@ -8979,7 +8945,7 @@ msgstr "Contacts"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Date"
 
@@ -8990,7 +8956,7 @@ msgstr "Nickname"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Message"
 
@@ -9016,192 +8982,188 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Exporting History Logs..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Do you really want to delete the logs of the selected contact?"
 msgstr[1] "Do you really want to delete the logs of the selected contacts?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Do you really want to delete the selected message?"
 msgstr[1] "Do you really want to delete the selected messages?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Conversation History with %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Error message: %s"
+msgstr "Error: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Error."
+msgstr "Error"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Timeout loading image"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Image is too big"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "You are not connected to the server"
+msgstr "You are going to close several tabs"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Do you really want to delete the selected message?"
+msgstr "Do you really want to close them all?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- messages will be logged"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- messages will not be logged"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Messaged by %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "New Message from %(nickname)s"
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:568
 msgid "Ignore"
-msgstr "_Ignore"
+msgstr "Ignore"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "File is empty"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "File does not exist"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Without a connection you can not publish your contact information."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9209,46 +9171,51 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Now \"%s\" will know your status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG is not usable"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "You will be connected to %s without OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9256,28 +9223,27 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Really quit Gajim?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Are you sure you want to leave group chat \"%s\"?"
+msgstr "Are you sure you want to quit Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Always close Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9285,16 +9251,16 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9302,11 +9268,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9315,69 +9281,69 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
-msgstr ""
-"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "You are about to block a contact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Also remove all contacts in this group from your roster"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
-msgstr ""
+msgstr "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9386,11 +9352,11 @@ msgstr ""
 "her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9398,16 +9364,16 @@ msgstr ""
 "By removing this contact you also by default remove authorisation resulting "
 "in him or her always seeing you as offline."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9416,33 +9382,34 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"You are about to create a metacontact. Are you sure you want to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then they will see your global status."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "You must create an account before you can chat with other contacts."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9450,13 +9417,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9466,23 +9433,23 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Do you want to send this file to %s:"
 msgstr[1] "Do you want to send these files to %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Send %s"
+msgstr "Send %s to %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Make %s and %s metacontacts"
@@ -9492,157 +9459,156 @@ msgstr "Make %s and %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Configure Services..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "To all users"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "To all online users"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Edit _Groups"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Send Single Message"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Execute Command..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Manage Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Rename"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Disconnect"
+msgstr "_Reconnect"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Waiting for results"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Error in received dataform"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "No result"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Disk WriteError"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Confirm these session options"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9657,7 +9623,7 @@ msgstr ""
 "\n"
 "\tAre these options acceptable?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9672,116 +9638,116 @@ msgstr ""
 "\n"
 "Continue with the session?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Resource: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [blocked]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [minimised]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Last status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Connected"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Subscription: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Tune:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Transferred: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Not started"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "Paused"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "This service has not yet responded with detailed information"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9789,29 +9755,28 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9819,7 +9784,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9827,13 +9792,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9841,18 +9806,71 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "You are waiting contact's answer about your subscription request"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "There is no pending subscription request."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Incoming message:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Outgoing message:"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP passphrase was not given"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[This message is encrypted]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i days ago"
+
+#~ msgid "Trayicon"
+#~ msgstr "Trayicon"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "A icon in systemtray reflecting the current presence."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Requires PyGTK >= 2.10."
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Add Special _Notification"
 
@@ -9899,11 +9917,23 @@ msgstr " resource with priority "
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "Invited %(contact_jid)s to %(room_jid)s."
 
-#, fuzzy
+#~ msgid ""
+#~ "There is an ambiguity: %d nicks match.\n"
+#~ " Please use graphical interface "
+#~ msgstr ""
+#~ "There is an ambiguity: %d nicks match.\n"
+#~ " Please use graphical interface "
+
 #~ msgid "Nickname not found"
-#~ msgstr "Nickname not found: %s"
+#~ msgstr "Nickname not found"
+
+#~ msgid ""
+#~ "There is an ambiguity: %d nicks match.\n"
+#~ " Please use graphical interface"
+#~ msgstr ""
+#~ "There is an ambiguity: %d nicks match.\n"
+#~ " Please use graphical interface"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -9911,8 +9941,7 @@ msgstr " resource with priority "
 #~ msgstr ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
-#~ "If the JID is currently in the group chat, he/she/it will also be kicked. "
-#~ "Does NOT support spaces in nickname."
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
 
 #~ msgid ""
 #~ "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -9942,14 +9971,12 @@ msgstr " resource with priority "
 #~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
 #~ "optionally using specified nickname."
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
 #~ "nickname from the group chat and optionally displays a reason."
 #~ msgstr ""
 #~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
-#~ "nickname from the group chat and optionally displays a reason. Does NOT "
-#~ "support spaces in nickname."
+#~ "nickname from the group chat and optionally displays a reason."
 
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -9974,11 +10001,19 @@ msgstr " resource with priority "
 #~ msgstr ""
 #~ "Usage: /%s <message>, sends a message without looking for other commands."
 
-#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
+#~ "messages."
+#~ msgstr ""
+#~ "Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
+#~ "messages."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
 #~ "messages."
-#~ msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
 
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr "Click to see features (like MSN, ICQ transports) of jabber servers"
@@ -10476,9 +10511,6 @@ msgstr " resource with priority "
 #~ msgid "A_fter nickname:"
 #~ msgstr "A_fter nickname:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "B_efore nickname:"
-
 #~ msgid "_After time:"
 #~ msgstr "_After time:"
 
diff --git a/po/eo.po b/po/eo.po
index ff244d63a..5c99492a5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-19 23:48+0200\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -287,9 +287,9 @@ msgstr "Korekti personan informon..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -298,9 +298,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Ĝenerala"
 
@@ -357,21 +357,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informo pri vi, kiel estas en la servilo"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Neniu ŝlosilo elektita"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Neniu"
 
@@ -528,8 +528,8 @@ msgstr ""
 "Vi povas pripensi ŝanĝon de permeseblaj parametroj de retŝirmilo."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -543,7 +543,7 @@ msgid "Mer_ge accounts"
 msgstr "_Unuigi kontojn"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Re_nomigi"
 
@@ -958,7 +958,7 @@ msgstr "Familia nomo:"
 msgid "New entry received"
 msgstr "Kiam ricevas novan eventon"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
@@ -1006,12 +1006,12 @@ msgstr "Enigu novan pasvorton:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Tajpu vian novan statmesaĝon</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Ŝaltita"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Babilejo:"
@@ -1106,8 +1106,8 @@ msgstr "Aranĝi _Grupojn"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "In_viti al"
 
@@ -1122,8 +1122,8 @@ msgid "Remo_ve"
 msgstr "_Forigi"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sendi propran XML"
@@ -1159,8 +1159,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Permesi al li/ŝi vidi vian staton"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1171,7 +1171,7 @@ msgstr "_Malpermesi al li/ŝi vidi vian staton"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Historio"
 
@@ -1194,8 +1194,8 @@ msgid "_Subscription"
 msgstr "_Abono"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
@@ -1288,7 +1288,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Daŭrigi"
 
@@ -1296,7 +1296,7 @@ msgstr "_Daŭrigi"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Avizi min kiam dosiero estas transdonita"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Malfermi enhavantan dosierujon"
 
@@ -1324,7 +1324,7 @@ msgstr ""
 "Kontakta linio\n"
 "Rubando"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Dika"
 
@@ -1344,11 +1344,11 @@ msgstr "Etosa administrado de Gajim"
 msgid "Gone"
 msgstr "Foriris"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktiva"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Kursiva"
 
@@ -1399,7 +1399,7 @@ msgstr "Ŝanĝi _temon"
 msgid "Configure _Room..."
 msgstr "Administri _babilejon"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Starigi legosignon por tiu babilejo"
@@ -1498,8 +1498,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim administrilo de protokoloj"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Forigi"
 
@@ -1524,7 +1525,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Serĉi datumbaze"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Historio de interparoloj"
 
@@ -1550,7 +1551,7 @@ msgstr "_Protokoli komunikadan historion"
 msgid "Bookmark this room"
 msgstr "Starigi legosignon por tiu babilejo"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
@@ -1577,8 +1578,8 @@ msgstr "Antaŭ nelonge:"
 msgid "Room:"
 msgstr "Babilejo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Aliĝi"
 
@@ -1606,7 +1607,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Eligi statojn:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Servilo:"
 
@@ -1732,17 +1733,26 @@ msgid "Show a list of formattings"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Klaku por enigi mienon (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Sendi"
 
@@ -1866,7 +1876,7 @@ msgstr ""
 "Aŭtodetekti dum ĉiu Gajim lanĉo\n"
 "Ĉiam uzi defaŭlton de GNOME\n"
 "Ĉiam uzi defaŭlton de KDE\n"
-"Ĉiam uzi defaŭlton de XFCE\n"
+"Ĉiam uzi defaŭlton de Xfce\n"
 "Propraj"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1884,6 +1894,16 @@ msgid "Configure color and font of the interface"
 msgstr "Agordo de koloro kaj tiparo de la fasado"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "_Statmesaĝo:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Kontaktnomo"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1892,34 +1912,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Montri _kromajn detalojn pri retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1929,7 +1949,7 @@ msgstr ""
 "povas havi kun kontakto. Tie ĉi vi povas specifi kiujn babilstatojn vi volas "
 "montri en interparolaj fenestroj."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1939,7 +1959,7 @@ msgstr ""
 "Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
 "interparolanto."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1947,36 +1967,36 @@ msgstr ""
 "Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
 "ekrano pri kontaktoj kiu ĵus elsalutis"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1984,7 +2004,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1992,7 +2012,7 @@ msgstr ""
 "Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
 "la kontaktlisto kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2000,7 +2020,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2008,7 +2028,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2016,14 +2036,14 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2034,21 +2054,21 @@ msgstr ""
 "singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
 "kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2058,13 +2078,13 @@ msgstr ""
 "kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
 "fora, okupata ktp...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2072,79 +2092,79 @@ msgstr ""
 "Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
 "ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Unu mesaĝfenestro:"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Admi_nistri..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "Konta korektado"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Avizi pri novaj _Gmail-leteroj"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "Persona detalaĵoj"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Ludi _sonojn"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Agordo"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "Montri eventon en _taskopleto"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "E_nsalutas"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "E_lsalutas"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2152,30 +2172,30 @@ msgstr ""
 "Iuj mesaĝoj povas enteni tekstatributojn (aranĝo, koloro k.t.p.). Se "
 "markitas, Gajim simple montros krudan mesaĝan tekston."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Ordigi kontaktojn per stato"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Defaŭlta stata p_iktogramaro:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "Style"
 msgstr "Malrapidas"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Etoso:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2183,7 +2203,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2191,113 +2211,115 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Uzi _transportilajn piktogramarojn"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Uzi sisteman defaŭlton"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Kiam ricevas novan eventon"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Erara mesaĝo: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Antaŭ kaŝnomo:"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "Aŭtomate _fora post:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Rigardilo:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Montrataj babilstataj _avizoj:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Mienoj:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Dosieradministrilo:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Emfazi misskribajn vortojn"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignori formatadon en venantaj mesaĝoj"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "Ve_nanta mesaĝo:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "Ret_poŝtkliento:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Aŭtomate nedisponebla post:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Malfermi..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "E_lira mesaĝo:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Reŝargi kolorojn per defaŭlto"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Montrataj babilstataj _avizoj:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "Eniri en babilejon"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutoj"
 
@@ -2350,7 +2372,7 @@ msgstr "Jabber-ID"
 msgid "Order:"
 msgstr "Ordnumero:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Privata listo"
 
@@ -2514,7 +2536,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Agordo</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Sonoj</b>"
@@ -2578,8 +2600,8 @@ msgstr "Forigi konton el Gajim kaj el _servilo"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Forigi"
 
@@ -2598,14 +2620,14 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Forigi"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_O kej"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr "Forigi"
 
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
@@ -2666,7 +2688,7 @@ msgstr "_Agoj"
 msgid "_Contents"
 msgstr "_Enhavo"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "A_dministri"
 
@@ -2709,12 +2731,12 @@ msgid "_Add contact"
 msgstr "Aldoni _kontakton"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 #, fuzzy
 msgid "_Information"
 msgstr "Kontakta informo"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Serĉi"
 
@@ -2734,10 +2756,6 @@ msgstr "Registri ĉe"
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_O kej"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2954,329 +2972,316 @@ msgstr "Risurco:"
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontakta informo"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Ŝaltita"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Malŝaltita"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Bulea"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Entjera"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Koloro"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Parametra nomo"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Valoro"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Datumtipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Mankas)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Kaŝita"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr ""
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] ""
+msgstr[1] ""
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Angla"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Belorusa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretona"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Germana"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Greka"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Brita"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Eŭska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Franca"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Itala"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norvega (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Pola"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brazila Portugala"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Serbian"
 msgstr "Germana"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Ĉina (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Lingvo de literumado"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Konekto mankas"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Via mesaĝo ne povas esti sendita dum vi senkonektas."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "Substreko"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Kaŝnomo"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "_Tiparo:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontakta informo"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ĉifrado ebligata"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aŭtentokontrolon"
@@ -3284,58 +3289,58 @@ msgstr "Uzi aŭtentokontrolon"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3343,22 +3348,22 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
@@ -3367,23 +3372,23 @@ msgstr "%(nick)s nun estas %(status)s"
 msgid "creating logs database"
 msgstr "kreadas protokolan datumbazon"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s estas dosiero sed devas esti dosierujo"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim fermos tuj"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s estas dosierujo sed devas esti dosiero"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "kreas dosierujon %s"
@@ -3454,10 +3459,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 #, fuzzy
 msgid "Groupchats"
 msgstr "Babilejoj"
@@ -3569,9 +3574,9 @@ msgid ""
 msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 #, fuzzy
 msgid "default"
 msgstr "Defaŭlte"
@@ -4209,7 +4214,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4217,125 +4222,125 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "'all' aŭ spacetseparitaj statoj"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', aŭ 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' aŭ ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Manĝas"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Kino"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Laboras"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefonado"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Eliris"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4343,107 +4348,106 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "verda"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "homa"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "mara"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Malprava servilnomo"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrada informo por transportilo %s ne venis ĝustatempe"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Vizitkarto estas sukcese publicita"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kaŝnomo malpermesita: %s"
@@ -4451,77 +4455,77 @@ msgstr "Kaŝnomo malpermesita: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Babileja kreado limigitas."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vi devas uzi vian registritan kaŝnomon."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vi ne ĉeestas en membrolisto."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Permeso estas forigita"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nun ni abonas %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "ordono pri abona fino de %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ni nun ne abonas pri %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4661,109 +4665,138 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Neeblas sendi senenhavajn dosierojn"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Temo: %s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Rekonektu mane."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Nekorekta respondo"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aŭ provu denove poste."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Kontrolu vian konekton aŭ provu denove poste"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Eraro dum forigado de privata listo"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4772,77 +4805,45 @@ msgstr ""
 "Privata listo %s ne forigitis. Ĝi eble estas aktiva en unu el viaj "
 "konektitaj risurcoj. Malaktivigu ĝin kaj provu denove."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Neeblas sendi senenhavajn dosierojn"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Temo: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktoj"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Rigardiloj"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transportiloj"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Mankas en kontaktlisto"
 
@@ -5089,7 +5090,7 @@ msgstr "Babilema"
 msgid "_Available"
 msgstr "_Enrete"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Enrete"
 
@@ -5207,77 +5208,77 @@ msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Sendi mesaĝon"
 msgstr[1] "Sendi mesaĝon"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5293,16 +5294,16 @@ msgid "%s is not a valid loglevel"
 msgstr "%s ne estas valida protokola detalnivelo"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "eraro: %s nedisponeblas por legi"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "blua"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "indeksigas protokolan datumbazon"
 
@@ -5311,703 +5312,722 @@ msgstr "indeksigas protokolan datumbazon"
 msgid "XMPP account %s@%s"
 msgstr "de konto %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "Paŭzas"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Dika"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Brave"
 msgstr "Havas "
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Babilejoj"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Dika"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Enhavo"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Plenumita"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Enhavo"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Malŝaltita"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 #, fuzzy
 msgid "Curious"
 msgstr "uri"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Forigi"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Disappointed"
 msgstr "malŝaltitaj"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Dismayed"
 msgstr "malŝaltitaj"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Distracted"
 msgstr "malŝaltitaj"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Excited"
 msgstr "Ŝaltita"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "_Retnodo:"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "mesaĝo"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Ŝaltita"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Nevidebla"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "unu"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "_Retnodo:"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Germana"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "_Korekti"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Senkonekta"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "dekunu"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "Malrapidas"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "Kaŝnomo"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "Dormas"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Strato:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Abonita"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "Substreko"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Malprava servilnomo"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Vespero"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "Tajpas mesaĝon"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "Mateno"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "ĉiuj en la grupo"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Vespero"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "Elpelatas %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "_Aliĝi"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Grooming"
 msgstr "babilejo"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Korektas temon"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "Elpelatas %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "Elpelatas %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "E_lsalutas"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "Kialo"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Kialo"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "Dormas"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Mi spektas filmon."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Mi telefonas."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "Transdonas"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "Tajpas mesaĝon"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 #, fuzzy
 msgid "On a Train"
 msgstr "Malfermi  kiel _ligilon"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "Tajpas mesaĝon"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "Laboras"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -6029,36 +6049,11 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"La servilnomo, specifita de vi en la agordero \"ft_override_host_to_send\" "
-"de la detala agordo, ne ekzistas aŭ malkorektas, tial estas ignorata."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP-pasfrazo ne estis donita"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Vi estos konektita al %s sen OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Por plu sendi kaj ricevi mesaĝojn, vi bezonas rekonekti."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Eraro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6067,54 +6062,46 @@ msgstr ""
 "%s\n"
 "Lig-loka komunikado ne povas funkcii korekte."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Ne povas lanĉi lokan servon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Neeblas aliĝi al pordo %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ne povas ŝanĝi staton de konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Vi estas senkonekta aŭ nevidebla por aliaj. Via mesaĝo ne estis sendita."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
@@ -6125,26 +6112,26 @@ msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
 msgid "Error while adding service. %s"
 msgstr "eraro dum aldonado de servo %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "malŝaltitaj"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "Defaŭlta statmesaĝo"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "Ebligi"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6153,214 +6140,214 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Ĉu rekonektu nun?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se vi volas ekuzi la ĉiujn ŝanĝojn, vi devas rekonekti."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Nelegitaj eventoj"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "Por ŝanĝi la nomon de konto, vi devas legi atendantajn eventojn."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 #, fuzzy
 msgid "Rename Account"
 msgstr "Administri kontojn"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Bonvolu renomigi aŭ forigi ĝin antaŭ ebligi lig-lokan komunikadon."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6368,11 +6355,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6380,11 +6367,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6392,11 +6379,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6404,7 +6391,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6421,58 +6408,59 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "Ĉiujn"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "Neniujn"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6480,31 +6468,31 @@ msgstr ""
 "tiun ĉi legosignon."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 #, fuzzy
 msgid "Invalid server"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6514,34 +6502,34 @@ msgstr ""
 "Vi povas agordi kromajn kontajn parametrojn alklakinte la butonon \"Krome\" "
 "aŭ pli poste menueron Kontoj en menuo Administri de la ĉefa fenestro."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6551,7 +6539,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6559,72 +6547,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "GMail-retletero venis"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6633,230 +6621,227 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Eliri"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Vortara URL ne enhavas \"%s\" kaj ĝi ne estas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Hieraŭ"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "Antaŭ %i tagoj"
+msgid_plural "%i days ago"
+msgstr[0] "Hieraŭ"
+msgstr[1] "Hieraŭ"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-tujmesaĝilo"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktnomo: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "En la grupo"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "Ŝlosil-ID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Kontaktnomo"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "Enigi tagmesaĝon"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Mesaĝo por la stato \"%s\""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Konservi kiel antaŭpreparita statmesaĝo"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM-adreso:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG numero:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ numero:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN-adreso:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo-adreso:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni ĉe konto %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber-kliento"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Versio de GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Versio de PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Nunaj programistoj:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Ĝisnunaj programistoj:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "DANKON AL:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Fine ne malpli ol aliajn ni dankas ĉiujn pakaĵvartistojn."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6867,103 +6852,107 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Demando pri abono por konto %s de %s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Eniri en babilejon per konto %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ne estas la nomo de babilejo."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Babili per konto %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Babili"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6972,301 +6961,330 @@ msgstr ""
 "al kiu vi volas sendi mesaĝon:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Neeblas analizi \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nova unuobla mesaĝo"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Mi estas %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML-konzolo"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Malrapidas"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "_Korekti"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Forigi"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
 msgstr "Aldoni"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber-ID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Aldoni _kontakton"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Forigas kontakton el kontaktlisto"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordnumero: %s, ago: %s, tipo: %s, valoro: %s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "n°"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Kondiĉo"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "dum mi estas "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7274,38 +7292,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7315,31 +7333,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Aliaj"
@@ -7349,24 +7386,24 @@ msgstr "Aliaj"
 msgid "Conference"
 msgstr "Babilejoj"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7374,341 +7411,336 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Tiu tipo de servo ne enhavas erojn por rigardi."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Rigardado %s per konto %s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Rigardi"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Plenumi komandon..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanas %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Uzuloj"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Priskribo"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Legosigno jam estas metita"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Legosigno sukcese aldonitas"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 #, fuzzy
 msgid "Node"
 msgstr "Neniu"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Nova mesaĝo"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Komandoj: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Ĉifrado per OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Ve_nanta mesaĝo:"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "Historia administrilo"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "Mesaĝo sendita"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Pasvortoj diversas"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Konta korektado"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Ĉifrado per OpenPGP"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Ve_nanta mesaĝo:"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Ĝenerala"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "Servilaj trajtoj"
@@ -7725,141 +7757,141 @@ msgstr "Tempo"
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosiernomo: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Longo: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Dosiertransmeto plenumitas"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Dosiera transmeto nuligitas"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Konekto kun punkto neestableblas."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Ricevanto: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Elektu dosieron por sendi..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Priskribo: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne povas atingi tiun dosieron"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Tiu ĉi dosiero estas uzata de alia procezo."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Dosiero: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Priskribo: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s volas sendi al vi dosieron:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Dosiero kun tiu nomo jam ekzistas kaj vi ne havas permeson reskribi ĝin."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Kion vi volas fari?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Konservi dosieron kiel..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7867,32 +7899,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Malkorekta dosiero"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Dosiero: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Sendanto: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Paŭzo"
 
@@ -7963,11 +7995,11 @@ msgstr ""
 "povas preni ĝin ĉe %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim jam estas lanĉita"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7975,432 +8007,28 @@ msgstr ""
 "Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
 "Ĉu lanĉu malgraŭ tio?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Pasfrazo necesas"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Vi estos konektita al %s sen OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Malprava pasfrazo"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
-"Bonvolu specifi alian kaŝnomon jene:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Ĉu vi akceptas tiun peton?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Ĉu vi akceptas tiun peton?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Konektado malsukcesis"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "eraro dum sendado %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Mendo de abono"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Permespeto akceptitas"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakto \"%s\" nuligis abonon de vi"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Malaboni"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakto kun \"%s\" neestableblas"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s nomiĝas %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s nun estas %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Necesas pasvorto por aliĝi al la babilejo."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Via pasfrazo estas malvalida"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Via pasfrazo estas malvalida"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Ne plu demandi"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnoma ŝlosilaro (Gnome Keyring) instalitas sed ne estas korekte lanĉita "
-"(medivariablo eble ne korekte valorizitas)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nova retletero ĉe %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Vi havas %d novan retleteron"
-msgstr[1] "Vi havas %d novajn retleterojn"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s volas sendi dosieron al vi."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Forigas kontakton el kontaktlisto"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Eraro dum legado de dosiero:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "La dosiero %(filename)s de %(name)s estas sukcese ricevita."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Vi sukcese sendis %(filename)s al %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "En ĉ_iu mesaĝo"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Konflikto de salutnomoj"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Bonvolu enigi novan salutnomon por via loka konto"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Konflikto de salutnomoj"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Konekto"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Ĉifrado malebligata"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Ne povis konservi vian agordon"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Montri helpon pri specifita komando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "komando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "montri helpon pri komando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Antaŭigas fenestron kun la sekva atendanta evento"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8408,50 +8036,50 @@ msgstr ""
 "Eligas liston de ĉiuj kontaktoj de kontaktlisto. Ĉiu kontakto aperas en "
 "separata lineo"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "Montri kontaktojn nur de specifita konto"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Eligas liston de registritaj kontoj"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "mesaĝo"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statmesaĝo"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8460,22 +8088,22 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Priori_tato:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Mi volas registri novan konton"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8485,23 +8113,23 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Montras interparolan fenestron do vi povas sendi mesaĝon al kontakto"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Se specifita, kontakto estos prenata el kontaktlisto de tiu ĉi konto"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8511,29 +8139,29 @@ msgstr ""
 "kaj konto estas fakultativaj. Se vi volas specifi nur konton sen OpenPGP-"
 "ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP-ŝlosilo"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Se specifita, la mesaĝo estos ĉifrita per tiu ĉi publika ŝlosilo"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "Se specifita, la mesaĝo estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8543,134 +8171,134 @@ msgstr ""
 "ŝlosilo kaj konto estas fakultativaj. Se vi volas specifi nur konton sen "
 "OpenPGP-ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "temo"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Ricevas detalan informon pri kontakto"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "dosiero"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "\"ŝlosilo\" estas nomo de parametro, \"valoro\" estas ĝia stato"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ŝlosilo"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nomo de forigota parametro"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skribas la aktualan agordon de Gajim en la dosieron \".config\""
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Aligas kontakton en kontaktliston"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Aldonas novan kontakton en tiun konton"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Donas nuntempan staton (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Donas kvanton de nelegitaj mesaĝoj"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Malfermi \"Ekparoli\" dialogfenestron"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Babili per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Sendi propran XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML por sendi"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8678,77 +8306,77 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Prilabori xmpp:/ uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Aliĝi al MUC-babilejo"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "babilejo"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Babilejo:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "kaŝnomo"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "pasvorto:"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Pasvortoj diversas"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8757,31 +8385,31 @@ msgstr ""
 "%s mankas en via kontaktlisto\n"
 "Bonvolu specifi konton por sendi la mesaĝon."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumentoj:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8790,7 +8418,7 @@ msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8799,7 +8427,7 @@ msgstr ""
 "Tro multe da argumentoj. \n"
 "Enigu \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8808,7 +8436,7 @@ msgstr ""
 "Argumento \"%s\" ne estas specifita. \n"
 "Enigi \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Malprava uri"
 
@@ -8838,174 +8466,198 @@ msgstr "Vi ne povas forigi aktivan etoson"
 msgid "Please first choose another for your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Vi ne plu ĉeestas en babilejo \"%s\" aŭ \"%s\" foriris."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historio de interparoloj"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konekto"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Aliĝo de %(nick)s nun estas malpermesa: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Aliĝo de %(nick)s estas malpermesita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s nomiĝas %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aparteneco:"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s nun estas %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se vi fermos tiun fenestron, vi senkonektiĝos de tiu ĉi babilejo."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Ne plu demandi"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Priskribo: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
@@ -9029,59 +8681,449 @@ msgid "Details"
 msgstr "Detalaĵoj"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Eraro dum dosieranalizo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Ne povas skribi en %s. Subteno de seancagordo ne funkcios"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ne estas defaŭlta jabber-kliento"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ĉu vi deziras fari Gajim la defaŭlta jabber-kliento?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Ĉiam kontrolu ĉu Gajim estas defaŭlta jabber-kliento dum lanĉo"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Bildo nekonserveblas en %(type)s formato. Ĉu konservu kiel %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
+"Bonvolu specifi alian kaŝnomon jene:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Ĉu vi akceptas tiun peton?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Ĉu vi akceptas tiun peton?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Konektado malsukcesis"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "eraro dum sendado %s ( %s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Mendo de abono"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Permespeto akceptitas"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakto \"%s\" nuligis abonon de vi"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Malaboni"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakto kun \"%s\" neestableblas"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Necesas pasvorto por aliĝi al la babilejo."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Via pasfrazo estas malvalida"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Via pasfrazo estas malvalida"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnoma ŝlosilaro (Gnome Keyring) instalitas sed ne estas korekte lanĉita "
+"(medivariablo eble ne korekte valorizitas)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nova retletero ĉe %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Vi havas %d novan retleteron"
+msgstr[1] "Vi havas %d novajn retleterojn"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s volas sendi dosieron al vi."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Forigas kontakton el kontaktlisto"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Eraro dum legado de dosiero:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "La dosiero %(filename)s de %(name)s estas sukcese ricevita."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Vi sukcese sendis %(filename)s al %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "En ĉ_iu mesaĝo"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Konflikto de salutnomoj"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Bonvolu enigi novan salutnomon por via loka konto"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1721
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Konflikto de salutnomoj"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s volas sendi dosieron al vi."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Mendo de dosiera transmeto"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Konekto"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Ĉifrado malebligata"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Ne povis konservi vian agordon"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Pasfrazo necesas"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Vi estos konektita al %s sen OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Malprava pasfrazo"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Mi volus aldoni vin en mian kontaktliston"
 
@@ -9096,7 +9138,7 @@ msgstr "Kontaktoj"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Dato"
 
@@ -9107,7 +9149,7 @@ msgstr "Kaŝnomo"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Mesaĝo"
 
@@ -9132,239 +9174,244 @@ msgstr ""
 "\n"
 "Se vi alklakos JES, bonvolu atendi..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Eksportas protokolojn..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s je %(time)s diris: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Ĉu vi vere volas forigi protokolojn de la elektita kontakto?"
 msgstr[1] "Ĉu vi vere volas forigi protokolojn de la elektitaj kontaktoj?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Tio ĉi estas neinversigebla ago."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 msgstr[1] "Ĉu vi efektive volas forigi la elektitajn mesaĝojn?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historio de interparolo kun %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s nun estas %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Mesaĝoj"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ŝanĝis staton"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s ensalutis"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s elsalutis"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova unuopa mesaĝo de %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privata mesaĝo de babilejo %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "naŭ"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Obtenas vizitkarton..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 #, fuzzy
 msgid "File is empty"
 msgstr "Dosierindiko"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tiu babilejo ne ekzistas."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informo estas ricevita"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senkonekte vi ne povas publikigi vian kontaktan informon."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Publicas vizitkarton..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informo NE publicitis"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "Estis eraro dum publicado de persona informo, provu denove pli poste."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Permeso estas sendita"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" akceptas tiun peton vi povos koni lian aŭ ŝian staton."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Permeso estas forigita"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Vi estos konektita al %s sen OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9372,44 +9419,44 @@ msgstr ""
 "Ŝanĝo de via stato per nevidebla okazigos diskonektadon de tiuj babilejoj. "
 "Ĉu vi certas ke vi volas iĝi nevidebla?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "Mesaĝoj disponeblos por legi ĝin poste nur se vi ŝaltis historion."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9417,11 +9464,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9430,69 +9477,69 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ĉu vi volas forigi la grupon %s de la kontaktlisto?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Forigi ankaŭ ĉiujn kontaktojn de la grupo el via kontaktlisto"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9501,12 +9548,12 @@ msgstr ""
 "vidos vin kiel senkonekta."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9514,16 +9561,16 @@ msgstr ""
 "Forigante tiu ĉi konton vi defaŭlte ankaŭ forigas permeson pro kio li aŭ ŝi "
 "ĉiam vidos vin senkonekta."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Permesi al tiu ĉi konto koni mian staton post forigado"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9532,32 +9579,32 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9566,12 +9613,12 @@ msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9581,24 +9628,24 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s volas sendi al vi dosieron:"
 msgstr[1] "%s volas sendi al vi dosieron:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Sendi %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
@@ -9608,164 +9655,164 @@ msgstr "Igi %s kaj %s metakontaktoj"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "al konto %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "per konto %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "Aranĝi _legosignojn..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "de konto %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "por konto %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Serĉi servojn..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Aranĝi _Grupojn"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Sendi unuopan mesaĝon"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Plenumi komandon..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportiloj"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Montri Trans_portilojn"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Renomigi"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontakto malkonektita"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontakto malkonektita"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Temo: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9775,7 +9822,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9785,119 +9832,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "Ŝanĝi _statmesaĝon..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Risurco: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de tiu ĉi babilejo"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Lasta stato: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " ekde %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "Konekto"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontakto malkonektita"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Abono: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Elŝuti"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Transmetitas: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Ne lanĉitas"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Haltis"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Plenumita"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "Paŭzas"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Malrapidas"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Transdonas"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9905,30 +9952,30 @@ msgstr ""
 "Tiu ĉi servo ne povis respondi per detala informo.\n"
 "Ĝi verŝajne estas malnova aŭ rompita"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "ekde %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programoj</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9936,36 +9983,73 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 "Vi interesiĝas pri kontakta ĉeesta informo, sed li/ŝi ne interesiĝas pri via"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vi kaj la kontakto interesiĝas unu pri alia ĉeesta informo"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Nek vi nek kontakto ne interesiĝas unu pri ĉeesto de alia"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "Ve_nanta mesaĝo:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "E_lira mesaĝo:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk+"
+
+#, fuzzy
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "La servilnomo, specifita de vi en la agordero \"ft_override_host_to_send"
+#~ "\" de la detala agordo, ne ekzistas aŭ malkorektas, tial estas ignorata."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP-pasfrazo ne estis donita"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr "Por plu sendi kaj ricevi mesaĝojn, vi bezonas rekonekti."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Vi estas senkonekta aŭ nevidebla por aliaj. Via mesaĝo ne estis sendita."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
+
+#~ msgid "%i days ago"
+#~ msgstr "Antaŭ %i tagoj"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Aligi specialan _avizon"
 
@@ -10540,9 +10624,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "A_fter nickname:"
 #~ msgstr "Post kaŝnomo:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "Antaŭ kaŝnomo:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Post tempo:"
 
diff --git a/po/es.po b/po/es.po
index 8de42b210..ac0e1d936 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-12-06 22:12+0100\n"
 "PO-Revision-Date: 2009-08-19 23:49+0200\n"
 "Last-Translator: Membris Khan <frank@giingo.org>\n"
 "Language-Team: none <>\n"
@@ -104,9 +104,8 @@ msgstr ""
 "Huella SHA1 del certificado:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Usar autentificación"
+msgstr "Autentificación a_nónima"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -195,7 +194,7 @@ msgstr "_Servidor:"
 
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Miscelánea</b>"
 
@@ -279,9 +278,9 @@ msgstr "_Editar información personal personales..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1156
+#: ../src/common/helpers.py:1168 ../src/notify.py:553 ../src/notify.py:574
+#: ../src/notify.py:612 ../src/notify.py:624
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -290,9 +289,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:59 ../src/common/contacts.py:140
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2747
+#: ../src/roster_window.py:5259
 msgid "General"
 msgstr "General"
 
@@ -352,21 +351,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Información acerca de tí a guardar en el servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1702
+#: ../src/config.py:2252
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1215
+#: ../src/config.py:1318 ../src/config.py:1606 ../src/config.py:1611
+#: ../src/config.py:2159 ../src/config.py:2238 ../src/config.py:2251
+#: ../src/config.py:3452 ../src/config.py:3525 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2801 ../src/roster_window.py:2807
+#: ../src/roster_window.py:2812
 msgid "None"
 msgstr "Ninguno"
 
@@ -473,18 +472,16 @@ msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
-msgstr "_Ajustar al estado"
+msgstr "Ajustar al esta_do"
 
 #: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Cuentas"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Usar autentificación"
+msgstr "Autentificación anónima"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -495,9 +492,8 @@ msgstr ""
 "de una conexión no segura."
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
-msgstr "C_onectar al inicio de Gajim"
+msgstr "Co_nectar al inicio de Gajim"
 
 #: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
@@ -526,8 +522,8 @@ msgstr ""
 "firewall."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1729
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
@@ -541,57 +537,47 @@ msgid "Mer_ge accounts"
 msgstr "_Combinar las cuentas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5214
 msgid "Re_name"
 msgstr "Re_nombrar"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
-msgstr "Enviar paquetes de mantenimiento de actividad"
+msgstr "Enviar pa_quetes de mantenimiento de actividad"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
-msgstr "Sinc_ronizar el estado de la cuenta con el estado global"
+msgstr "Sincroni_zar el estado de la cuenta con el estado global"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use G_PG Agent"
-msgstr "Usar _agente GPG"
+msgstr "Usar agente G_PG"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
-msgstr "Usar nombre de host y puerto personalizados"
+msgstr "Usar nombre de h_ost y puerto personalizados"
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Usar puerto personalizado:"
+msgstr "Usar puert_o personalizado:"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "_Editar información personal personales..."
+msgstr "_Editar información personal..."
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Activar"
+msgstr "Ha_bilitar"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
-msgstr "Nombre del host:"
+msgstr "Nombre del _host:"
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Gestionar..."
+msgstr "_Gestionar..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
 msgstr "_Puerto:"
 
@@ -600,9 +586,8 @@ msgid "_Warn before using an insecure connection"
 msgstr "_Advertir antes de usar una conexión no segura"
 
 #: ../data/glade/accounts_window.glade.h:63
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
-msgstr "usar variable de entorno HTTP_PROXY"
+msgstr "_usar variable de entorno HTTP__PROXY"
 
 #: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
@@ -785,7 +770,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Condiciones</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/glade/preferences_window.glade.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sonidos</b>"
 
@@ -802,7 +787,7 @@ msgid "All statuses"
 msgstr "Todos los estados"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../src/common/commands.py:106 ../src/common/helpers.py:231
 msgid "Away"
 msgstr "Ausente"
 
@@ -819,7 +804,7 @@ msgid "Have "
 msgstr "Tiene "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:241
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -828,7 +813,7 @@ msgid "Launch a command"
 msgstr "Lanzar un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:214
 msgid "Not Available"
 msgstr "No disponible"
 
@@ -950,7 +935,7 @@ msgstr "Última modificación:"
 msgid "New entry received"
 msgstr "Nueva entrada recibida"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Has recibido una nueva entrada:"
 
@@ -994,11 +979,11 @@ msgstr "Introduce nueva contraseña:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Escribe tu nuevo mensaje de estado</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Actividad:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Estado de ánimo:"
 
@@ -1021,7 +1006,7 @@ msgstr "_Añadir al roster"
 
 #: ../data/glade/chat_context_menu.glade.h:3
 msgid "_Copy JID/Email Address"
-msgstr "_Copiar la dirección"
+msgstr "_Copiar la dirección de correo/ID de Jabber"
 
 #: ../data/glade/chat_context_menu.glade.h:4
 msgid "_Copy Link Location"
@@ -1088,8 +1073,8 @@ msgstr "Editar _grupos..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5169
+#: ../src/roster_window.py:5324
 msgid "In_vite to"
 msgstr "In_vitar a"
 
@@ -1102,8 +1087,8 @@ msgid "Remo_ve"
 msgstr "_Eliminar"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5179
+#: ../src/roster_window.py:5411
 msgid "Send Cus_tom Status"
 msgstr "Envía estado personalizado"
 
@@ -1136,8 +1121,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Permitirle ver mi estado"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5238
+#: ../src/roster_window.py:5361 ../src/roster_window.py:5488
 msgid "_Block"
 msgstr "_Bloquear"
 
@@ -1148,7 +1133,7 @@ msgstr "Prohibirle ver mi estado"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5557
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1169,8 +1154,8 @@ msgid "_Subscription"
 msgstr "_Subscripción"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5232
+#: ../src/roster_window.py:5355 ../src/roster_window.py:5485
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
@@ -1262,7 +1247,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Cuando una transferencia se completa, muestra una notificación emergente"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1270,7 +1255,7 @@ msgstr "_Continuar"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificarme cuando una transferencia finalice"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Abrir carpeta contenedora"
 
@@ -1298,7 +1283,7 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Negrita"
 
@@ -1318,11 +1303,11 @@ msgstr "Personalización de temas de Gajim"
 msgid "Gone"
 msgstr "Me fui"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Cursiva"
 
@@ -1370,7 +1355,7 @@ msgstr "Cambiar el _tema"
 msgid "Configure _Room..."
 msgstr "Configurar el salón"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1745
 msgid "_Bookmark"
 msgstr "_Marcador"
 
@@ -1434,13 +1419,13 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Crear nuevo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:256
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Tema"
 
@@ -1459,8 +1444,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenido al gestor de históricos de Gajim</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3005
+#: ../src/dialogs.py:3102
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1490,7 +1476,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Buscar en la base de datos"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Histórico de conversaciones"
 
@@ -1518,7 +1504,7 @@ msgstr "Histórico de conversaciones"
 msgid "Bookmark this room"
 msgstr "Añadir este salón a marcadores (Ctrl+B)"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2075
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
@@ -1545,8 +1531,8 @@ msgstr "Recientemente:"
 msgid "Room:"
 msgstr "Salón:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1305
+#: ../src/disco.py:1749
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1574,7 +1560,7 @@ msgstr "Minimizar al ingresar automáticamente"
 msgid "Print status:"
 msgstr "Mostrar estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1719
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -1603,14 +1589,14 @@ msgid "<b>Settings</b>"
 msgstr "<b>Configuración</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
 msgstr ""
 "Conexión HTTP\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1621,87 +1607,148 @@ msgid "Pass_word:"
 msgstr "_Contraseña: "
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Proxy"
+msgstr "_Host del Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Puerto:"
+msgstr "_Puerto del Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-#, fuzzy
 msgid "Use HTTP prox_y"
-msgstr "_Usar proxy"
+msgstr "Usar prox_y HTTP"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Usar autentificación"
+msgstr "Usar aut_entificación del proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
-msgstr ""
+msgstr "URL _BOSH:"
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Tipo:"
+msgstr "_Tipo:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
 msgstr "_Nombre"
 
-#: ../data/glade/message_window.glade.h:1
+#. # means number
+#: ../data/glade/message_window.glade.h:1 ../src/dialogs.py:3937
+msgid "#"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:2
+msgid "*"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:3
+#: ../data/glade/single_message_window.glade.h:1
+msgid "0"
+msgstr "0"
+
+#: ../data/glade/message_window.glade.h:4
+msgid "1"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:13
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Añade éste contacto al roster (Ctrl+D)"
 
-#: ../data/glade/message_window.glade.h:2
+#: ../data/glade/message_window.glade.h:14
 msgid "Bookmark this room (Ctrl+B)"
 msgstr "Añadir este salón a marcadores (Ctrl+B)"
 
-#: ../data/glade/message_window.glade.h:3
+#: ../data/glade/message_window.glade.h:15
 msgid "Browse the chat history (Ctrl+H)"
 msgstr "Navegar en el histórico de la conversación (Ctrl+H)"
 
-#: ../data/glade/message_window.glade.h:4
+#: ../data/glade/message_window.glade.h:16
 msgid "Change the room's subject (Alt+T)"
 msgstr "Cambiar el tema del salón (Alt+T)"
 
-#: ../data/glade/message_window.glade.h:5
+#: ../data/glade/message_window.glade.h:17
 msgid "Change your nickname (Ctrl+N)"
 msgstr "Cambiar tu _alias (Ctrl+N)"
 
-#: ../data/glade/message_window.glade.h:6
+#: ../data/glade/message_window.glade.h:18
 msgid "Invite contacts to the conversation (Ctrl+G)"
 msgstr "Invitar contactos a esta conversación (Ctrl+G)"
 
-#: ../data/glade/message_window.glade.h:7
+#: ../data/glade/message_window.glade.h:19
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:20
 msgid "Send a file (Ctrl+F)"
 msgstr "Enviar un archivo (Ctrl+F)"
 
-#: ../data/glade/message_window.glade.h:8
+#: ../data/glade/message_window.glade.h:21
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "Mostrar una lista de emoticonos (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
+#: ../data/glade/message_window.glade.h:22
 msgid "Show a list of formattings"
-msgstr "Mostrar una lista de emoticonos (Alt+M)"
+msgstr "Mostrar una lista de formateos"
 
-#: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#: ../data/glade/message_window.glade.h:23
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Muestra un menú de funciones avanzadas (Alt+A)"
 
-#: ../data/glade/message_window.glade.h:11
+#: ../data/glade/message_window.glade.h:24
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Muestra el perfil del contacto (Ctrl+I)"
 
+#: ../data/glade/message_window.glade.h:25
+msgid "Sound volume:"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:26
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:27
+msgid "Toggle video session"
+msgstr ""
+
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/message_window.glade.h:13
+#: ../data/glade/message_window.glade.h:29
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1718,67 +1765,86 @@ msgid "<b>Applications</b>"
 msgstr "<b>Programas</b>"
 
 #: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Acciones</b>"
+
+#: ../data/glade/preferences_window.glade.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Estado automático</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Apariencia de la conversación</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/glade/preferences_window.glade.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Color de las líneas de la conversación</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/glade/preferences_window.glade.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notificación del estado de la conversación</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/glade/preferences_window.glade.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Condiciones</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Fuente</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opciones de GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensajes de estado predefinidos</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Privacy</b>"
 msgstr "<i>Privacidad</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Roster Appearance</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Mensajes de estado</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Temas</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Medio:</b>"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificationes Visuales</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:25
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1788,25 +1854,37 @@ msgstr ""
 "Sólo componiendo\n"
 "Desactivado"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:28
 msgid "Allow _OS information to be sent"
 msgstr "Permitir envío de información sobre el sistema operativo"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permitir notificaciones emergentes cuando estoy _ausente, no disponible, "
 "ocupado o invisible."
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Allow sound when I'm _busy"
-msgstr ""
+msgstr "Permitir sonido cuando estoy ocupado"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:31
 msgid "Ask status message when I:"
 msgstr "Preguntar mensaje de estado cuando esté: "
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:32 ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:34
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1817,22 +1895,32 @@ msgstr ""
 "Autodetectar en cada inicio de Gajim\n"
 "Siempre usar las aplicaciones por defecto de GNOME\n"
 "Siempre usar las apliacciones por defecto de KDE\n"
-"Siempre usar las aplicaciones por defecto de XFCE\n"
+"Siempre usar las aplicaciones por defecto de Xfce\n"
 "Personalizado"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:40
 msgid "Chat message:"
 msgstr "Mensaje de conversación:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Comprobar al inicio si Gajim es el cliente de Jabber por defecto"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Configure color and font of the interface"
 msgstr "Configurar colores y fuentes de la interfaz"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:43
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Mensaje de conversación:"
+
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Nombre de contacto"
+
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1846,31 +1934,31 @@ msgstr ""
 "Roster desacoplado con conversaciones agrupadas por cuenta\n"
 "Roster desacoplado con conversaciones agrupadas por tipo"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:50
 msgid "Display _activity of contacts in roster"
 msgstr "Mostrar la _actividad de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Display _extra email details"
 msgstr "Mostrar detalles _extra en los correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:52
 msgid "Display _tunes of contacts in roster"
 msgstr "Mostrar _ajustes de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar en el roster los a_vatares de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:54
 msgid "Display m_ood of contacts in roster"
 msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:55
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar en el roster los _mensajes de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:56
 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 "
@@ -1880,7 +1968,7 @@ msgstr ""
 "conversación que puedas tener con un contacto. Aquí puedes especificar qué "
 "estados de conversación quieres que se muestren en las ventanas."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:57
 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 "
@@ -1890,7 +1978,7 @@ msgstr ""
 "conversación que puedas tener con un contacto. Aquí puedes especificar qué "
 "estados de conversación enviar a la potra parte."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1898,11 +1986,11 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:60
 msgid "Hide all buttons in chat windows"
 msgstr "Oculta los botones en las ventanas de conversación."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1910,7 +1998,7 @@ msgstr ""
 "Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
 "estás usando"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1918,14 +2006,14 @@ msgstr ""
 "Si está marcado, Gajim también incluirá información acerca del remitente de "
 "los nuevos correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Si está marcado, Gajim cambiará el estado a Ausente cuando el ordenador no "
 "esté en uso"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1933,7 +2021,7 @@ msgstr ""
 "Si está marcado, Gajim cambiará el estado a no disponible cuando el "
 "ordenador ya no se use"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1941,7 +2029,7 @@ msgstr ""
 "Si está marcado, Gajim mostrará los avatares de los contactos en el roster y "
 "grupos de conversación"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1949,26 +2037,26 @@ msgstr ""
 "Si está marcado, Gajim mostrará los mensajes de estado de los contactos bajo "
 "el nombre de contacto en el roster y grupos de conversación"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará la actividad de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará el estado de ánimo de los contactos en el "
 "roster"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará los ajustes de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:70
 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 "
@@ -1978,7 +2066,7 @@ msgstr ""
 "ventanas de conversación. Si no se definió ningún idioma vía botón derecho "
 "en el campo de entrada, será usado el idioma por defecto."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:71
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1988,7 +2076,7 @@ msgstr ""
 "autorizados. Úsalo con precaución ya que bloqueará todos los mensajes de "
 "cualquier contacto que no esté en tu lista de contactos."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:72
 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 "
@@ -1998,7 +2086,7 @@ msgstr ""
 "cuenta que usando cifrado E2E, la parte remota tiene que aceptar al "
 "ingresar, o los mensajes no serán registrados."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2006,7 +2094,7 @@ msgstr ""
 "Si está marcado, Gajim mostrará una notificación cuando se reciba un nuevo "
 "correo vía GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:74
 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, "
@@ -2016,7 +2104,7 @@ msgstr ""
 "un contacto de MSN tendrá el icono de msn equivalente para su estado en "
 "línea, ausente, ocupado, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:75
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2024,7 +2112,7 @@ msgstr ""
 "Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
 "mensaje por defecto especificado."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2032,50 +2120,53 @@ msgstr ""
 "Si no está deshabilitado, Gajim reemplazará emoticonos ascii ':)' por su "
 "equivalente en iconos gráficos estáticos o animados"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Log _encrypted chat session"
 msgstr "R_egistrar conversación cifrada"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Ma_ke message windows compact"
 msgstr "Hacer compacta la ventana de mensajes"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Ma_nage..."
 msgstr "Gestio_nar..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Nunca\n"
+"Sólamente cuando haya eventos pendientes\n"
+"Siempre"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:84
 msgid "Notify me about contacts that sign _in"
 msgstr "Notif_icarme de los contactos que se conecten"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cuand un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Notify on new _GMail email"
 msgstr "Notificar de nuevos correos de _GMail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Personal Events"
 msgstr "Eventos personales"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2085,24 +2176,28 @@ msgstr ""
 "Notificarmelo\n"
 "Mostrar sólo en roster"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
+msgid "STUN server:"
+msgstr "Servidor:"
+
+#: ../data/glade/preferences_window.glade.h:94
 msgid "Show systray:"
-msgstr "_Mostrar evento en systray"
+msgstr "Mostrar systray:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:95
 msgid "Sign _in"
-msgstr "Conectar"
+msgstr "Cone_ctar"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:96
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:97
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2110,145 +2205,157 @@ msgstr ""
 "Algunos mensajes pueden incluir contenido enriquecido (formato, colores "
 "etc). Si está marcado, Gajim mostrará el mensaje en bruto."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:98
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:99 ../src/config.py:384
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Status _iconset:"
 msgstr "Set de _iconos de estado:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Style"
 msgstr "Estilo"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:102
 msgid "T_heme:"
 msgstr "Te_ma:"
 
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:103
 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 ""
-"El mensje de autoestado ausente. Si está vacío, Gajim no cambiará el mensaje "
-"de estado actual"
+"El mensje de estado de auto-ausencia. Si está vacío, Gajim no cambiará el "
+"mensaje de estado actual\n"
+"$S será reemplazado por el anterior mensaje de estado\n"
+"$T será reemplazado por la activación del auto-ausente"
 
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:106
 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 ""
-"El mensaje de autoestado no disponible. Si está vacío, Gajim no cambiará el "
-"mensaje de estado actual"
+"El mensaje de estado de auto-no disponbile. Si está vacío, Gajim no cambiará "
+"el mensaje de estado actual\n"
+"$S será reemplazado por el anterior mensaje de estado\n"
+"$T será reemplazado por la activación del auto-no disponible"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:109
 msgid "Use _transports icons"
 msgstr "Usar iconos de _transporte"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:110
 msgid "Use system _default"
 msgstr "Usar pre_definido del sistema"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:111
+msgid "Video input device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+msgid "Video output device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:113
 msgid "When new event is received:"
 msgstr "Cuando se recibe un nuevo evento:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:114
+#, fuzzy
+msgid "Your message:"
+msgstr "Mensaje de error: %s"
+
+#: ../data/glade/preferences_window.glade.h:115
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Ant_es del alias:"
+
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Away after:"
 msgstr "_Ausente tras:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Display chat state notifications:"
 msgstr "_Mostrar notificaciones de estado de la conversación:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Emoticons:"
 msgstr "_Emoticonos:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_File manager:"
 msgstr "A_dministrador de archivos:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:123
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorar contenido enriquecido en mensajes entrantes"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "Mens_aje entrante:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:124
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:125
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:126
 msgid "_Not available after:"
 msgstr "_No disponible tras:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:127
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Mensaje saliente:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:128
 msgid "_Reset to Default Colors"
 msgstr "_Restablecer colores por defecto"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:129
 msgid "_Send chat state notifications:"
 msgstr "Enviar notificaciones del estado de la conversación:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:130
 msgid "_Status message:"
 msgstr "Men_saje de estado:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:131
 msgid "_URL highlight:"
 msgstr "Resaltado de _URL:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:132
 msgid "_Window behavior:"
 msgstr "_Comportamiento de la ventana:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:133
 msgid "in _group chats"
 msgstr "en _grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:134
 msgid "in _roster"
 msgstr "en _roster"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:135
 msgid "minutes"
 msgstr "minutos"
 
@@ -2301,7 +2408,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Orden:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3233
 msgid "Privacy List"
 msgstr "Lista de privacidad"
 
@@ -2445,7 +2552,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefijo:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:331
 msgid "<b>Role:</b>"
 msgstr "<b>Rol:</b>"
 
@@ -2505,8 +2612,8 @@ msgstr "Eliminar la cuenta de Gajim y del _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5371 ../src/roster_window.py:5498
 msgid "_Remove"
 msgstr "_Eliminar"
 
@@ -2515,22 +2622,24 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>alguien@algunsitio.com</b> quiere <b>añadir</b> algunos contactos a tu "
+"roster."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Cuerpo del mensaje <actualmente sin uso, estará escondido por defecto>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Intercambio de elementos del roster"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-delete"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-ok"
+msgid "gtk-cancel"
 msgstr ""
 
 #: ../data/glade/roster_window.glade.h:1
@@ -2558,9 +2667,8 @@ msgid "Profile, A_vatar"
 msgstr "Perfil, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Mostrar contactos desconectados"
+msgstr "Mostrar sólo contactos _activos"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2589,7 +2697,7 @@ msgstr "_Acciones"
 msgid "_Contents"
 msgstr "_Contenidos"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1466
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -2630,11 +2738,11 @@ msgid "_Add contact"
 msgstr "Añadir un _Contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5510
 msgid "_Information"
 msgstr "_Información"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1317
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2654,14 +2762,6 @@ msgstr "Registrar en"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
 #: ../data/glade/single_message_window.glade.h:2
 msgid "From:"
 msgstr "De:"
@@ -2764,9 +2864,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Cliente:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>Estado:</b>"
+msgstr "<b>Hora del contacto:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
@@ -2865,284 +2964,264 @@ msgstr "Recurso:"
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Cancelar información"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Hay un comando en ejecución. ¿Realmente quieres cancelarlo?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "El servicio envió información malformada"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "El servicio cambió el identificador de la sesión"
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "El servicio devolvió un error"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Activado"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Desactivado"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Entero"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Color"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Nombre de la opción"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Oculta"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Has recibido una nueva entrada:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Has recibido nuevas entradas (y %(count)d no mostradas):"
+msgstr[1] "Has recibido nuevas entradas (y %(count)d no mostradas):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Inglés"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Bieloruso"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Griego"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Británico"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Euskera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Noruego (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Portugués de Brasil"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Chino (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Lenguaje del corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no será enviado mientras no estés conectado."
 
-#: ../src/chat_control.py:820
-#, fuzzy
+#: ../src/chat_control.py:861
 msgid "Underline"
-msgstr "Indefinido"
+msgstr "Subrayado"
 
-#: ../src/chat_control.py:821
-#, fuzzy
+#: ../src/chat_control.py:862
 msgid "Strike"
-msgstr "Servicio"
+msgstr "Tachado"
 
-#: ../src/chat_control.py:844
-#, fuzzy
+#: ../src/chat_control.py:885
 msgid "Font"
-msgstr "_Fuente:"
+msgstr "Fuente"
 
-#: ../src/chat_control.py:853
-#, fuzzy
+#: ../src/chat_control.py:894
 msgid "Clear formating"
-msgstr "Información"
+msgstr "Limpiar formato"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "¿Enviar fichero?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Si envías un archivo a %s, el/ella sabrá tu ID de Jabber real."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1420 ../src/chat_control.py:1883
 msgid "GPG encryption enabled"
 msgstr "Cifrado GPG habilitado"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1445 ../src/common/contacts.py:157
+#: ../src/common/contacts.py:274 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:243 ../src/dialogs.py:1060 ../src/dialogs.py:1972
+#: ../src/dialogs.py:2001 ../src/gui_interface.py:606
+#: ../src/gui_menu_builder.py:251 ../src/gui_menu_builder.py:394
+#: ../src/roster_window.py:1575 ../src/roster_window.py:1577
+#: ../src/roster_window.py:1892 ../src/roster_window.py:3195
+#: ../src/roster_window.py:3221
 msgid "Not in Roster"
 msgstr "no está en el roster"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1489
 msgid "This contact does not support file transfer."
-msgstr "Una lista de transferencias activas, finalizadas y detenidas"
+msgstr "Este contacto no soporta transferencia de archivos"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1492
 msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr ""
-
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Artista desconocido"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Título desconocido"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Recurso desconocido"
+msgstr "Necesitas conocer la ID de Jabber real para enviarle un archivo."
 
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1573
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
-"de <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1751
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s del salón %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1863 ../src/dialogs.py:4619
 msgid "No GPG key assigned"
 msgstr "Ninguna clave GPG asignada"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1864
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3150,50 +3229,50 @@ msgstr ""
 "No se ha asignado ninguna clave GPG a este contacto. Por tanto no podrás "
 "cifrar mensajes con GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1873
 msgid "GPG encryption disabled"
 msgstr "Cifrado GPG deshabilitado"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1899
 msgid "Session WILL be logged"
 msgstr "La sesión SERÁ registrada"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1901
 msgid "Session WILL NOT be logged"
 msgstr "La NO SERÁ registrada"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1918
 msgid "is"
 msgstr "es"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1918
 msgid "is NOT"
 msgstr "NO es"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1920
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1920
 msgid "will NOT"
 msgstr "no será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1924
 msgid "and authenticated"
 msgstr "y autentificado"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1928
 msgid "and NOT authenticated"
 msgstr "y NO autenticado"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1935
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3202,23 +3281,23 @@ msgstr ""
 "%(type)s cifrado %(status)s activo %(authenticated)s.\n"
 "Tu sesión %(logged)s guardada."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2075
 msgid "Session negotiation cancelled"
 msgstr "La negociación de la sesión ha sido cancelada"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2084
 msgid "This session is encrypted"
 msgstr "Esta sesión está cifrada"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2087
 msgid " and WILL be logged"
 msgstr " y SERÁ registrada"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2089
 msgid " and WILL NOT be logged"
 msgstr " y NO SERÁ registrada"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2094
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3226,25 +3305,25 @@ msgstr ""
 "No se verificó la identidad del contacto remoto. Click en el botón del "
 "escudo para más detalles."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2096
 msgid "E2E encryption disabled"
 msgstr "Cifrado E2E desactivado"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2133 ../src/chat_control.py:2146
 msgid "The following message was NOT encrypted"
 msgstr "El siguiente mensaje NO fue cifrado"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2139
 msgid "The following message was encrypted"
 msgstr "El siguiente mensaje fue cifrado"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2408
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2409
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3252,15 +3331,15 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2552 ../src/common/connection_handlers.py:2158
+#: ../src/common/connection_handlers.py:2204
+#: ../src/common/connection_handlers.py:2398
+#: ../src/common/connection_handlers.py:2543 ../src/common/connection.py:432
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Error en la base de datos"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2553
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3269,116 +3348,116 @@ msgstr ""
 "No se pudo leer el archivo de base de datos (%s). Intenta repararlo o "
 "elimínalo (se perderá todo el histórico)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2791
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s está ahora %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:122 ../src/common/check_paths.py:133
+#: ../src/common/check_paths.py:140
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s es un archivo pero podría ser un directorio"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:123 ../src/common/check_paths.py:134
+#: ../src/common/check_paths.py:141 ../src/common/check_paths.py:149
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:148
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s es un directorio pero podría ser un archivo"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:164
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Cambiar información de estado"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Cambiar estado"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Definir la presencia y una descripción"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "En línea"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "No molestar."
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Desconectado"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Descripción de la presencia:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Se ha cambiado el estado."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Abandonar grupos de charla"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s en %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "No has entrado al grupo de charla"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr "Elige los grupos de conversación que quieres abandonar"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:212 ../src/common/contacts.py:136
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1579 ../src/roster_window.py:1581
+#: ../src/roster_window.py:5139
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Abandonaste los siguientes grupos de charla:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Reenviar mensajes sin leer"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Todos los mensajes sin leer han sido reenviados"
 
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Reproducir sonido cuando el usuario esté ocupado"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3387,6 +3466,7 @@ msgstr "Usar DBus y el demonio notificador para mostrar notificaciones"
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
+"Mostrar en el roster sólamente los contactos en línea o libres para hablar"
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3419,6 +3499,7 @@ msgstr ""
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
+"Cuándo mostrar el icono systray. Puede ser 'nunca', 'en eventos', 'siempre'."
 
 #: ../src/common/config.py:93
 #, fuzzy
@@ -3473,9 +3554,9 @@ msgstr ""
 "Lista (separada por espacios) de filas (cuentas y grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:487
+#: ../src/common/optparser.py:283 ../src/common/optparser.py:479
+#: ../src/common/optparser.py:513 ../src/gui_interface.py:3231
 msgid "default"
 msgstr "por defecto"
 
@@ -3677,6 +3758,9 @@ 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 ""
+"Preguntar antes de cerrar una ventana de conversación con pestañas si hay un "
+"control que pueda perder datos (conversaciones, grupos de conversación que "
+"no están minimizados)"
 
 #: ../src/common/config.py:192
 msgid ""
@@ -3959,13 +4043,12 @@ msgstr ""
 "las contraseñas de la cuenta."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Si es True, Gajim usará Gnome Keyring (si está disponible) para almacenar "
-"las contraseñas de la cuenta."
+"Si es True, Gajim usará KDE Wallet (si está disponible kwalletcli) para "
+"almacenar las contraseñas de la cuenta."
 
 #: ../src/common/config.py:262
 msgid ""
@@ -4032,7 +4115,6 @@ msgstr ""
 "El mayor es el más grande."
 
 #: ../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)"
@@ -4045,6 +4127,9 @@ 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 ""
+"Preguntar mensaje de estado desconectado a todos los contactos desconectados "
+"cuando se establezca conexión con una cuenta. ADVERTENCIA: ¡Ésto puede "
+"causar el envío de muchas peticiones!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
@@ -4056,7 +4141,11 @@ msgid ""
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:279
+msgid "STUN server to use when using jingle"
+msgstr ""
+
+#: ../src/common/config.py:291
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4064,7 +4153,7 @@ msgstr ""
 "La prioridad cambiará automáticamente acorde a tu estado. Las prioridades "
 "están definidas en las opciones de autoprioridad_*"
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:299
 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"
@@ -4073,38 +4162,38 @@ msgstr ""
 "invisible. NOTA: esta opción se usa sólo si restore_last_status está "
 "desactivado"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:300
 msgid "If enabled, restore the last status that was used."
 msgstr "Si está activado, restaurar el último estado que fue usado"
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:302
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:303
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Si es False, no verás más el avatar en la ventana de conversación."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:306
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Si está desactivado, no firmar presencias con la clave GPG, incluso si GPG "
 "está configurado."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:308
 msgid "Enable ESessions encryption for this account."
 msgstr "Activar cifrado ESessions para esta cuenta."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:309
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "¿Gajim debería iniciar automáticamente una sesión cifrada cuando sea posible?"
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:310
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4112,44 +4201,43 @@ msgstr ""
 "Lista ordenada (separada por espacios) de tipos de conexión para probar. "
 "Puede contener tls, ssl o plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:311
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:312
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Muestra un aviso antes de usar la librería SSL estándar"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:314
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espacios de errores ssl a ignorar."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:323
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Espacio en blanco enviado tras inactividad"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:324
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "Ping XMPP enviado tras inactividad"
 
-#: ../src/common/config.py:323
-#, fuzzy
+#: ../src/common/config.py:328
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
-"Cuántos segundos eseprar una respuesta de paquetes de mantenimiento de "
+"Cuántos segundos esperar una respuesta de paquetes de mantenimiento de "
 "actividad antes de  intentar reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:332
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:335
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4157,15 +4245,15 @@ msgstr ""
 "Si está marcado, Gajim usará tu IP y proxies definidos en la opción "
 "file_transfer_proxies para tu transferencia."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:349
 msgid "Answer to receipt requests"
 msgstr "Contestar peticiones recibidas"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:350
 msgid "Sent receipt requests"
 msgstr "Enviar peticiones recibidas"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:358
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4173,11 +4261,11 @@ msgstr ""
 "Cuando se negocie una sesión cifrada, ¿Gajim debería asumir que quieres que "
 "tus mensajes sean registrados?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:421
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "¿Está OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:422
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4185,101 +4273,101 @@ msgstr ""
 "¿Debería Gajim iniciar automáticamente una sesión cifrada con este contacto "
 "cuando sea posible?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:423 ../src/common/config.py:426
 msgid "Language for which we want to check misspelled words"
 msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:432
 msgid "all or space separated status"
 msgstr "estado separado por espacios o all"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:433
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:434 ../src/common/config.py:436
+#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:441
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' o ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:447 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:448
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:448
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:449 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:449
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:450
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:450
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:451 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:451
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:452
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:452
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:453
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:453
 msgid "I'm out enjoying life."
 msgstr "Estoy fuera disfrutando la vida"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:464
 msgid "I'm available."
 msgstr "Estoy disponible"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:465
 msgid "I'm free for chat."
 msgstr "Estoy libre para hablar"
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:466 ../src/config.py:1534
 msgid "Be right back."
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm not available."
 msgstr "No estoy disponible."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Do not disturb."
 msgstr "No molestar."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:469 ../src/common/config.py:470
 msgid "Bye!"
 msgstr "¡Adiós!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:480
 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."
@@ -4288,99 +4376,98 @@ msgstr ""
 "palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
 "contiene tu alias."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:481
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:490 ../src/common/optparser.py:297
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:494 ../src/common/optparser.py:283
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:502
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "No se puede cargar el módulo idle"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:257
 msgid "Wrong host"
 msgstr "Host erróneo"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:258
 msgid "Invalid local address? :-O"
 msgstr "¿Dirección local no válida? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:723
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "La información de registro para el transporte %s no llegó a tiempo"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:730
 msgid "Registration succeeded"
-msgstr "vCard publicada con éxito"
+msgstr "Registro realizado con éxito"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:731
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Registro con el agente %s realizado con éxito"
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:733
 msgid "Registration failed"
-msgstr "falló la publicación de la vCard"
+msgstr "Falló el registro"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:733
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
+"El registro con el agente %(agent)s falló con el error %(error)s: %"
+"(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1037
+#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2202
+#: ../src/common/connection_handlers.py:2396
+#: ../src/common/connection_handlers.py:2541 ../src/common/connection.py:430
+#: ../src/gajim.py:353
 msgid "Disk Write Error"
 msgstr "Error de escritura en disco"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1260 ../src/common/connection.py:1431
 msgid "Invisibility not supported"
 msgstr "Invisibilidad no soportada"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1261 ../src/common/connection.py:1432
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "La cuenta %s no soporta invisibilidad."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1977 ../src/common/connection.py:245
+#: ../src/config.py:1996 ../src/config.py:2005 ../src/config.py:2064
+#: ../src/config.py:3416 ../src/dataforms_widget.py:577 ../src/dialogs.py:2779
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1978
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
+msgstr "Ha llegado un mensaje de una JID no válida, ha sido ignorado."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2159
+#: ../src/common/connection_handlers.py:2205
+#: ../src/common/connection_handlers.py:2399
+#: ../src/common/connection_handlers.py:2544 ../src/common/connection.py:433
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4390,7 +4477,7 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) o elimínalo (se perderá todo el "
 "histórico)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2251
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alias no permitido: %s"
@@ -4398,76 +4485,76 @@ msgstr "Alias no permitido: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2346
+#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:2360
+#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2366
+#: ../src/common/connection_handlers.py:2370 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "No se pudo entrar al grupo de charla"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2347
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2355
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Estás baneado del grupo de charla %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2361
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "El grupo de charla %s no existe."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2364
 msgid "Group chat creation is restricted."
 msgstr "La creación de grupos de charla está restringida."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2367
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Tu alias registrado podría estar en uso en el grupo de charla %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "No estás en la lista de miembros del grupo de charla %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2414
 msgid "Room has been destroyed"
 msgstr "El salón ha sido destruido"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2422
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Puedes unirte a este salón en su lugar: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2453
 msgid "I would like to add you to my roster."
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2474
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos ahora suscritos a %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2476
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "petición de eliminación de suscripción de %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2478
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ya no estamos suscritos a %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2673
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4605,81 +4692,109 @@ msgstr "El uso de la clave no incluye la firma de certificados"
 msgid "Application verification failure"
 msgstr "Falló la verificación de la aplicación"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:246 ../src/dialogs.py:2780
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "No es posible enviar un mensaje a %s, esta JID no es válida."
+
+#: ../src/common/connection.py:268
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Ni la presencia remota ha sido firmada, ni se ha asignado una clave"
+
+#: ../src/common/connection.py:271
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "La clave del contacto (%s) no coincide con la clave asignada en Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:319
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Este mensaje está *cifrado* (Mira :JEP:`27`]"
+
+#: ../src/common/connection.py:420
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tema: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:770
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Se ha perdido la conexión de la cuenta \"%s\""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:771
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:783
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "El servidor %(name)s contestó incorrectamente a la petición de registro: %"
 "(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:817
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "El servidor %s provee un formulario de registro diferente"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:830
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Error SSL desconocido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:845
 msgid "Invalid answer"
 msgstr "Respuesta no válida"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:846
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "El transporte %(name)s respondió incorrectamente a la petición de registro: %"
 "(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1127 ../src/common/connection.py:1256
+#: ../src/common/connection.py:1735
+#: ../src/common/zeroconf/connection_zeroconf.py:191
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1128 ../src/gui_interface.py:700
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1133
+#, python-format
 msgid "Server replied: %s"
-msgstr "Guardado en: %s"
+msgstr "El servidor respondió: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1146
 msgid "Connection to proxy failed"
 msgstr "Falló la conexión al proxy"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1177 ../src/common/connection.py:1236
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "No se puede conectar a la cuenta %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1178 ../src/common/connection.py:1237
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Se perdió la conexión con la cuenta %s. Reintentando la conexión."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1203
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "La autenticidad del certificado %s podría no ser válida."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1206
 #, python-format
 msgid ""
 "\n"
@@ -4688,7 +4803,7 @@ msgstr ""
 "\n"
 "Error SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1208
 #, python-format
 msgid ""
 "\n"
@@ -4697,25 +4812,25 @@ msgstr ""
 "\n"
 "Error SSL desconocido: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1257
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1288
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1290
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprueba que tu nombre de usuario y contraseña sean correctos."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1354
 msgid "Error while removing privacy list"
 msgstr "Error eliminando la lista de privacidad"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1355
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4724,76 +4839,46 @@ msgstr ""
 "La lista de privacidad %s no se ha eliminado. Podría estar activa en uno de "
 "tus recursos conectados. Desactívalo y prueba de nuevo."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "No es posible enviar archivos vacíos"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Ni la presencia remota ha sido firmada, ni se ha asignado una clave"
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "La clave del contacto (%s) no coincide con la clave asignada en Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Este mensaje está *cifrado* (Mira :JEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Tema: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1601
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Contacto enviado: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1604
 msgid "Sent contacts:"
-msgstr "Invitar _Contactos"
+msgstr "Contactos enviados:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1769 ../src/common/connection.py:1792
 msgid "Not fetched because of invisible status"
 msgstr "No conseguido debido al estado invisible"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2196
 #, fuzzy
 msgid "Unregister failed"
-msgstr "falló la publicación de la vCard"
+msgstr "Falló el registro"
 
-#: ../src/common/connection.py:1983
-#, python-format
+#: ../src/common/connection.py:2197
+#, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
+"El registro con el agente %(agent)s falló con el error %(error)s: %"
+"(error_msg)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:134 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:606
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:138 ../src/common/contacts.py:357
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1463 ../src/gui_interface.py:411
+#: ../src/roster_window.py:848 ../src/roster_window.py:1500
+#: ../src/roster_window.py:1571 ../src/roster_window.py:1573
+#: ../src/roster_window.py:1731
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:365
 msgid "Not in roster"
 msgstr "No está en el roster"
 
@@ -4811,31 +4896,33 @@ msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "falta la dependencia pysqlite2 (tcc python-pysqlite2). Saliendo..."
-
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "No se pudo leer la base de datos."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Servicio no disponible: Gajim no está ejecutándose, o remote_control está en "
 "False"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Bus de la sesión no disponible.\n"
-"Prueba leyendo http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr "El bus de la sesión no está disponible."
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
+msgstr "El bus de la sesión no está disponible."
 
 #: ../src/common/fuzzyclock.py:38
 msgid "twelve"
@@ -5000,240 +5087,273 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "¡Fin de semana!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:149
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:154
 msgid "Server address required."
 msgstr "Se requiere la dirección del servidor."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:160
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:167
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:207
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:209
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:212
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:217
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:219
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:222
 msgid "_Available"
 msgstr "En líne_a"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:224 ../src/features_window.py:118
 msgid "Available"
 msgstr "En línea"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:226
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:229
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:234
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:236
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:239
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:245
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:252
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:254
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:258
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:266
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:268
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:277
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:280
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:282
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:285
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:287
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:290
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:292
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:298
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:300
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:302
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:304
 msgid "Member"
 msgstr "Miembro"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:343
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:345
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:347
 msgid "is composing a message..."
 msgstr "está escribiendo..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:350
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:352
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:617
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:620
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:624
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:627
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:631
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:634
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:637
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1112
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensaje pendiente"
 msgstr[1] "%d mensajes pendientes"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1118
 #, python-format
 msgid " from room %s"
 msgstr " del salón %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1121 ../src/common/helpers.py:1140
 #, python-format
 msgid " from user %s"
 msgstr " del usuario %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1123
 #, python-format
 msgid " from %s"
 msgstr " de %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1130 ../src/common/helpers.py:1137
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1170
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/jingle_rtp.py:98
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Configuración del salón"
+
+#: ../src/common/jingle_rtp.py:99
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:285
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:288
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:317
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:325
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Error ejecutando \"%(command)s\": %(error)s"
@@ -5244,659 +5364,680 @@ msgid "%s is not a valid loglevel"
 msgstr "%s no es un nivel de registro válido"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:52
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para lectura"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:292 ../src/common/optparser.py:293
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:372
 msgid "migrating logs database to indices"
 msgstr "migrando la base de datos de registros a los índices"
 
 #: ../src/common/passwords.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "de la cuenta %s"
+msgstr "Cuenta XMPP %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Miedoso"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Impresionado"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Amoroso"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Enfadado"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Molesto"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Despierto"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Animado"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Calmado"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Cauto"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Frío"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Confiado"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Confuso"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Contemplativo"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Contento"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Irritable"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Alocado"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Creativo"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Curioso"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Desanimado"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Deprimido"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Decepcionado"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Disgustado"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Consternado"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Distraído"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Vergonzoso"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Envidioso"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Flirteador"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustrado"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Agradecido"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Dolido"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Malhumorado"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Culpable"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Deseoso"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Caliente"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Humilde"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Humillado"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Hambriento"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Dolido"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Impresionado"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Atemorizado"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Indignado"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Curioso"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Intoxicado"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Solitario"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Perdido"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Afortunado"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Significante"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Malhumorado"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervioso"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Ofendido"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Escandalizado"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Juguetón"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Orgulloso"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Relajado"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Aliviado"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Arrepentido"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Inquieto"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarcástico"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Satisfecho"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Serio"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Horrorizado"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Tímido"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Enfermo"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Adormilado"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Espontáneo"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Estresado"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Fuerte"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Sorprendido"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Agradecido"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Sediento"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Cansado"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Débil"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Preocupado"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Haciendo tareas"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Haciendo la compra"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Limpiando"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Cocinando"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Tareas de mantenimiento"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Fregando los platos"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Haciendo la colada"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Arreglando el jardín"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Haciendo un recado"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Paseando al perro"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Bebiendo"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Tomando una cerveza"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Tomando café"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Tomando té"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Tomando un tentempié"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Desayunando"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Cenando"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Almorzando"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Haciendo ejercicio"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Montando en bici"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Bailando"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Paseando"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Corriendo"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Haciendo deporte"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Corriendo"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Esquiando"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Nadando"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Trabajando"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Lavando"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "En el spa"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Lavando los dientes"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Cortando el pelo"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Afeitándome"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Tomando un baño"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Duchándome"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "En una cita"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Fin del día"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Saliendo por ahi"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Escondiéndome"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Rezando"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Vacaciones planificadas"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Pensando"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Relajándome"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Pescando"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Jugando"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Saliendo"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "De fiesta"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Leyendo"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Ensayando"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Comprando"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Fumando"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Socializándome"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "En el solarium"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Viendo la TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Viendo una película"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Hablando"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "En la vida real"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Al teléfono"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Al videoteléfono"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Viajando"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Conmutar"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Conduciendo"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "En el coche"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "En el bus"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "En el avión"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "En el tren"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "En un viaje"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Caminando"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Programando"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "En un encuentro"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Estudiando"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Escribiendo"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Artista desconocido"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Título desconocido"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Recurso desconocido"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
+"de <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:90
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "No se puede enlazar al puerto %s."
 
-#: ../src/common/socks5.py:87
+#: ../src/common/socks5.py:91
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5905,44 +6046,18 @@ msgstr ""
 "cancelada."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Esto es parte de una sesión cifrada. Si ves este mensaje, algo fue mal.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"El host %s que configuraste como la opción avanzada ft_override_host_to_send "
-"no es válido, será ignorado."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "No se ha facilitado la clave OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Te conectarás a %s sin OpenPGP"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Para continuar enviando y reciviendo mensajes, necesitarás volver a conectar."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:180
 msgid "Avahi error"
 msgstr "Error de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 #, python-format
 msgid ""
 "%s\n"
@@ -5951,53 +6066,44 @@ msgstr ""
 "%s\n"
 "La mensajería de enlace local podría no funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprueba si Avahi o Bonjour están instalados."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:201
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "Could not start local service"
 msgstr "No se pudo iniciar servicio local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:202
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "No se pudo enlazar al puerto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor, comprueba si avahi-daemon se encuentra en ejecución."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:284
+#: ../src/common/zeroconf/connection_zeroconf.py:295
+#: ../src/common/zeroconf/connection_zeroconf.py:309
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "No se pudo cambiar el estado de la cuenta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"No estás conectado o estás invisible a los demás. Tu mensaje no pudo ser "
-"enviado."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Este mensaje está cifrado]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:326
 msgid "Your message could not be sent."
 msgstr "Tu mensaje no pudo ser enviado."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:336
 msgid "Contact is offline. Your message could not be sent."
 msgstr "El contacto está desconectado. Tu mensaje no pudo ser enviado."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6009,24 +6115,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error añadiendo el servicio. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:164 ../src/config.py:622
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: ../src/config.py:396
+#: ../src/config.py:390
 msgid "Default Message"
 msgstr "Mensajes por defecto"
 
-#: ../src/config.py:405
+#: ../src/config.py:399
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:690 ../src/dialogs.py:1364
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "No está disponible el diccionario para el idioma %s"
 
-#: ../src/config.py:664
+#: ../src/config.py:691
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6035,74 +6141,73 @@ msgstr ""
 "Tienes que instalar el diccionario %s para usar el corrector, o elegir otro "
 "lenguaje definiendo la opción speller_language."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1149
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1149
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1450 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3012 ../src/disco.py:830 ../src/disco.py:1689
+#: ../src/disco.py:1991 ../src/history_window.py:89
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1543
 msgid "Relogin now?"
 msgstr "¿Reconectar ahora?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1544
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si quieres que se apliquen todos los cambios instantáneamente, debes "
 "reconectar."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1676 ../src/config.py:1801
 msgid "OpenPGP is not usable on this computer"
-msgstr "GPG no es usable en este ordenador"
+msgstr "OpenPGP no es usable en este ordenador"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1841 ../src/config.py:1885
 msgid "Unread events"
 msgstr "Eventos sin leer"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1842
 msgid "Read all pending events before removing this account."
 msgstr "Lee todos los eventos pendientes antes de eliminar esta cuenta."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1868
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Has abierto una conversación con la cuenta %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1869
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Todas las conversaciones y grupos de charla serán cerrados. ¿Deseas "
 "continuar?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1881 ../src/config.py:2404 ../src/config.py:2438
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1882
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1765
+#: ../src/config.py:1886
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar el nombre de la cuenta, debes leer el resto de\n"
 " eventos pendientes"
 
-#: ../src/config.py:1771
+#: ../src/config.py:1892
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta ya está en uso"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1893
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6110,147 +6215,147 @@ msgstr ""
 "Este nombre ya está en uso por otra de tus cuentas. Por favor, escoge otro "
 "nombre."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1897 ../src/config.py:1901
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1898
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1902
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1977
 msgid "Rename Account"
 msgstr "Renombrar cuenta"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1978
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduce un nuevo nombre para la cuenta %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:2006
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Una ID de Jabber debe estar en la forma \"usuario@nombreservidor\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2214 ../src/config.py:3462
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2215 ../src/config.py:3463
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:2115
+#: ../src/config.py:2236
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2237
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:2150
+#: ../src/config.py:2271
 msgid "OpenPGP Key Selection"
 msgstr "Selección de clave OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2272
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2279
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2280
 msgid "You must create your account before editing your personal information."
 msgstr "Debes crear una cuenta antes de editar tu información personal"
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2287 ../src/dialogs.py:2030 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:476 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2288
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sin una conexión, no puedes editar tu información personal"
 
-#: ../src/config.py:2171
+#: ../src/config.py:2292
 msgid "Your server doesn't support Vcard"
 msgstr "Tu servidor no soporta vCard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2293
 msgid "Your server can't save your personal information."
 msgstr "Tu servidor no puede guardar tu información personal."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2405 ../src/config.py:2439
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:2289
+#: ../src/config.py:2410
 msgid "Account Local already exists."
 msgstr "La cuenta local ya existe."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2411
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor, renómbralo o elimínalo antes de habilitar la mensajería de enlace "
 "local."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2566
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2568
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2604
 msgid "Ban List"
 msgstr "Lista de expulsión"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2605
 msgid "Member List"
 msgstr "Lista de miembros"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2606
 msgid "Owner List"
 msgstr "Lista de propietarios"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2607
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2656 ../src/disco.py:837 ../src/history_manager.py:201
 msgid "JID"
-msgstr ""
+msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2666
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2673
 msgid "Nick"
 msgstr "Alias"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2679
 msgid "Role"
 msgstr "Puesto"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2706
 msgid "Banning..."
 msgstr "Expulsando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2708
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6258,11 +6363,11 @@ msgstr ""
 "<b>¿A quién quieres expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2710
 msgid "Adding Member..."
 msgstr "Añadiendo miembro..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2711
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6270,11 +6375,11 @@ msgstr ""
 "<b>¿A quién quieres hacer miembro?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2713
 msgid "Adding Owner..."
 msgstr "Añadiendo propietario..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2714
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6282,11 +6387,11 @@ msgstr ""
 "<b>¿A quién quieres hacer propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2716
 msgid "Adding Administrator..."
 msgstr "Añadiendo administrador..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2717
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6294,8 +6399,7 @@ msgstr ""
 "<b>¿A quién quieres hacer administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2718
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6305,65 +6409,66 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 "Puede ser uno de los siguientes:\n"
-"1. usuario@dominio/recurso (sólo ese recurso coincide)2. usuario@dominio "
-"(cualquier recurso coincide)3. dominio/recurso (sólo ese recurso coincide)4. "
-"dominio (el dominio coincide, incluyendo cualquier\n"
-"usuario@dominio, dominio/recurso o dirección conteniendo\n"
-"un subdominio."
+"1. usuario@dominio/recurso (sólo ese recurso coincide).\n"
+"2. usuario@dominio (cualquier recurso coincide).\n"
+"3. dominio/ recurso (sólo lo que coincida con el recurso).\n"
+"4. dominio (el dominio coincide consigo mismo, tal como hace cualquier\n"
+"usuario@dominio, dominio/ recurso, o una dirección conteniendo un "
+"subdominio)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2819
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2841 ../src/gui_interface.py:1097
+#: ../src/gui_interface.py:1192
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2842 ../src/gui_interface.py:1172
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2843 ../src/gui_interface.py:1192
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2852
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2853
 msgid "If you remove it, the connection will be lost."
 msgstr "Si la eliminas, se perderá la conexión con el servidor"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2951
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2951
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2952
 msgid "Enter and leave only"
 msgstr "Entrar y salir sólamente"
 
-#: ../src/config.py:2821
-#, fuzzy
+#: ../src/config.py:2953
 msgid "?print_status:None"
-msgstr "Todos"
+msgstr "Ninguno"
 
-#: ../src/config.py:2889
+#: ../src/config.py:3023
 msgid "New Group Chat"
 msgstr "Nuevo grupo de charla"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3056
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3057
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6371,29 +6476,27 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3175 ../src/dialogs.py:1828
 msgid "Invalid nickname"
 msgstr "Alias no válido"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3176 ../src/config.py:3190 ../src/config.py:3204
 msgid "Character not allowed"
-msgstr "Alias no permitido: %s"
+msgstr "Carácter no permitido"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3189 ../src/config.py:3438
 msgid "Invalid server"
 msgstr "Servidor no válido"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3203
 msgid "Invalid room"
-msgstr "Entrada no válida"
+msgstr "Salón no válido"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3355
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3356 ../src/config.py:3362
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6404,32 +6507,32 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3361
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3399
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3401
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3439
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifica un servidor donde te quieras registrar."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3495 ../src/gui_interface.py:1841
 msgid "Certificate Already in File"
 msgstr "El certificado ya está en el archivo"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3496 ../src/gui_interface.py:1842
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Este certificado ya está en el archivo %s, no fue añadido de nuevo."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3566
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6444,7 +6547,7 @@ msgstr ""
 "Error SSL: %(error)s\n"
 "¿Aún quieres conectar a este servidor?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3572 ../src/gui_interface.py:1866
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6455,63 +6558,63 @@ msgstr ""
 "Huella SHA1 del certificado:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3599 ../src/config.py:3626
 msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3693
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3694
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/config.py:3704
+#: ../src/config.py:3847
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3855
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3890
 msgid "First Message Received"
 msgstr "Primer mensaje recibido"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3891
 msgid "Next Message Received Focused"
 msgstr "Primer mensaje recibido focalizado"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3893
 msgid "Next Message Received Unfocused"
 msgstr "Primer mensaje recibido desfocalizado"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3894
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3895
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3896
 msgid "Message Sent"
 msgstr "Mensaje enviado"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3897
 msgid "Group Chat Message Highlight"
 msgstr "Resaltado de mensaje de grupo de charla"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3898
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3899
 msgid "GMail Email Received"
 msgstr "Correo de GMail recibido"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:598
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6521,7 +6624,7 @@ msgstr ""
 "recibido por el extremo remoto. Si este icono permanece\n"
 "mucho tiempo, probablemente el mensaje se haya perdido."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:617
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6529,227 +6632,223 @@ msgstr ""
 "El texto bajo esta línea es lo que ha sido dicho desde la última vez que "
 "prestaste atención a este salón de charla"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:736
 msgid "_Quote"
-msgstr "_Salir"
+msgstr "_Cita"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:755
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:760
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:777
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" en la URL del Diccionario y no está en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:790
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" en la URL de la búsqueda web"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:793
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:799
 msgid "Open as _Link"
 msgstr "_Abrir como enlace"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1285
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Ayer"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "hace %i días"
+msgid_plural "%i days ago"
+msgstr[0] "Ayer"
+msgstr[1] "Ayer"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1320 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "La ID de Jabber ya está en la lista"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "La ID de Jabber que introdujiste ya está en la lista. Elige otra."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "nuevo@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nuevo%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Definir estado de ánimo"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "¿Sobreescribir mensaje de estado?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Este nombre ya se usa. ¿Quieres sobreescribir este mensaje de estado?."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Guardar como mensaje de estado predefinido"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Escribe un nombre para este mensaje de estado"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Dirección AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Número GG:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Número ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Dirección MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Dirección Yahoo!:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduce la inforamción del contacto que quieres añadir a la "
 "cuenta %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario no contiene un recurso."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "No puedes añadirte a tí mismo a tu roster."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Desarrolladores actuales:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Desarrolladores anteriores:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "AGRADECIMIENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Por último pero no menos importante, queremos agradecer a todos los "
 "mantenedores de paquetes."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1197
 msgid "translator-credits"
 msgstr "Fran Alburquerque <frank@giingo.org>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1365
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6762,99 +6861,104 @@ msgstr ""
 "\n"
 "No se usará el resaltado de los errores de escritura"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1829 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "El alias tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1947
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Petición de adición para la cuenta %(account)s de %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1950
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2025 ../src/gui_interface.py:2576
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2031
 msgid "You can not join a group chat unless you are connected."
 msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2073
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un grupo de charla con la cuenta %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "La cuenta desde la que quieres entrar al salón"
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Alias no válido"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1774
 msgid "Invalid group chat Jabber ID"
 msgstr "ID de Jabber no válida para el grupo de charla"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr ""
+"La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1775
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Esto no es un grupo de charla"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s no es el nombre de un grupo de charla."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Esta cuentano está conectada al servidor"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "No puedes sincronizar con una cuenta hasta que no te hayas conectado."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6863,298 +6967,318 @@ msgstr ""
 "enviar un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2765 ../src/dialogs.py:2927
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2766 ../src/dialogs.py:2928
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede analizar \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2467 ../src/notify.py:263 ../src/notify.py:499
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2469 ../src/notify.py:271 ../src/notify.py:501
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2471 ../src/notify.py:292 ../src/notify.py:344
+#: ../src/notify.py:503
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2471 ../src/notify.py:275 ../src/notify.py:345
+#: ../src/notify.py:503
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2472 ../src/notify.py:281 ../src/notify.py:345
+#: ../src/notify.py:504
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2472 ../src/gui_interface.py:1305 ../src/notify.py:513
 msgid "New E-mail"
 msgstr "Nuevo correo-e"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1368 ../src/notify.py:506
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1273
+#: ../src/gui_interface.py:1337 ../src/notify.py:508
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1413
+#: ../src/gui_interface.py:1435 ../src/gui_interface.py:1452
+#: ../src/notify.py:510
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2479 ../src/gui_interface.py:1416 ../src/notify.py:511
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1116 ../src/notify.py:515
 msgid "Groupchat Invitation"
 msgstr "Invitación a grupo de charla"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2483 ../src/notify.py:255 ../src/notify.py:517
 msgid "Contact Changed Status"
 msgstr "Contacto cambió su estado"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2684
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje en la cuenta %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2688
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2691
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2714
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2737
 #, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2816
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2817
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2866
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2868
 msgid "XML Console"
 msgstr "Consola XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2956
+#, fuzzy
+msgid "add"
+msgstr "Triste"
+
+#: ../src/dialogs.py:2956
+#, fuzzy
+msgid "modify"
+msgstr "Modificar"
+
+#: ../src/dialogs.py:2957
+#, fuzzy
+msgid "remove"
+msgstr "_Eliminar"
+
+#: ../src/dialogs.py:2985
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Me gustaría añadirte a mi lista de contactos."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> querría <b>%s</b> algunos contactos de tu roster."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3001 ../src/dialogs.py:3047
 msgid "Add"
 msgstr "Dirección"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3078
 msgid "Modify"
-msgstr "Malhumorado"
+msgstr "Modificar"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3009
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3015
 msgid "Groups"
-msgstr "Grupo"
+msgstr "Grupos"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3123
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Me gustaría añadirte a mi lista de contactos"
+msgstr "%s me sugirió añadirte en mi roster."
+
+#: ../src/dialogs.py:3137
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Añadir un _Contacto"
+
+#: ../src/dialogs.py:3174
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Elimina contacto del roster"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3227
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidad <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3231
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidad para %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3287
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orden: %(order)s, acción: %(action)s, tipo: %(type)s, valor: %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3292
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orden: %(order)s, acción: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3336
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar una regla</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3447
 msgid "<b>Add a rule</b>"
 msgstr "<b>Añadir una regla</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3547
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listas de privacidad para %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3549
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3619
 msgid "Invalid List Name"
 msgstr "Nombre de lista no válido"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3620
 msgid "You must enter a name to create a privacy list."
 msgstr "Debes introducir un nombre para crear una una lista de privacidad."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3652
 msgid "You are invited to a groupchat"
 msgstr "Has sido invitado a un grupo de charla"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3655
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact te ha invitado a entrar en una discusión"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3657
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact te ha invitado al grupo de charla %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3665
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3667
 msgid "Do you want to accept the invitation?"
 msgstr "¿Quieres aceptar la invitación?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3728
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3738 ../src/dialogs.py:3794
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3743
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3781
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3799
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3866
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cuando %s esté:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Añadiendo notificación especial para %s"
 
-#. # means number
-#: ../src/dialogs.py:3804
-msgid "#"
-msgstr ""
-
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3943
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4063
 msgid "when I am "
 msgstr "cuando esté "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4539
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7165,19 +7289,19 @@ msgstr ""
 "\n"
 "La cadena corta de autentificación de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4542
 msgid "You have already verified this contact's identity."
 msgstr "Ya verificaste la identidad de este contacto."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4548 ../src/dialogs.py:4632
 msgid "Contact's identity verified"
 msgstr "Identidad del contacto verificada"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4554
 msgid "Verify again..."
 msgstr "Verificar de nuevo..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4559
 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 "
@@ -7187,19 +7311,19 @@ msgstr ""
 "persona esperada, necesitas verificar su identidad haciendo click en el "
 "botón inferior."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4562 ../src/dialogs.py:4613 ../src/dialogs.py:4626
 msgid "Contact's identity NOT verified"
 msgstr "La identidad del contacto NO fue verificada"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4567
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4578
 msgid "Have you verified the contact's identity?"
 msgstr "¿Has verificado la identidad del contacto?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4579
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7214,22 +7338,22 @@ msgstr ""
 "\n"
 "La Cadena Corta de Autentificación (CCA) de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4580
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "¿Se lo dijiste a tu contacto remoto y verificaste el CCA?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4614
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "La clave del contacto (%s) <b>no coincide</b> con la clave asignada en Gajim."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4620
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "No se ha asignado una clave GPG a este contacto. No podrás cifrar mensajes."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4627
 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."
@@ -7238,7 +7362,7 @@ msgstr ""
 "de modo que <b>no</b> será cifrado. Usa tu cliente GPG para otorgar "
 "confianza a esta clave."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4633
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7246,6 +7370,25 @@ msgstr ""
 "La clave GPG se asignó a este contacto, y confías en esta clave, de modo que "
 "los mensajes serán cifrados."
 
+#: ../src/dialogs.py:4698
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4700
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4702
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4706
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Others"
@@ -7255,24 +7398,24 @@ msgstr "Others"
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:477
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:553
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:555
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:705
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:706
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7280,241 +7423,232 @@ msgstr ""
 "No hay servicio en la dirección introducida, o no está respondiendo. "
 "Comprueba la dirección e inténtalo de nuevo."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:710 ../src/disco.py:1046
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:711
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de servicio no contiene ningún elemento a navegar."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:750 ../src/disco.py:760
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:814
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar por %(address)s usando la cuenta %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:858
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1047
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1287
 msgid "_Execute Command"
 msgstr "_Ejecutar comando"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1297 ../src/disco.py:1468
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1509
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1699
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1707
 msgid "Description"
 msgstr "Descripción"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1715
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1780 ../src/gui_interface.py:3068
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1781 ../src/gui_interface.py:3069
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1790 ../src/gui_interface.py:3082
 msgid "Bookmark has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1791 ../src/gui_interface.py:3083
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2000
 msgid "Subscribed"
 msgstr "Añadido"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2008
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2072
 msgid "New post"
 msgstr "Nuevo post"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2078
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2084
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: ../src/features_window.py:46
-#, fuzzy
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
-msgstr "Error del certificado SSL"
+msgstr "Validación del certificado SSL"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Una librería usada para validar certificados de servidor para asegurar "
 "conexiones seguras."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Requiere python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Charla sin servidor con clientes autodetectados en una red local."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Requiere python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Requiere pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Comandos: %s"
+msgstr "Línea de comandos"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Un script para controlar Gajim vía línea de comandos."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Requiere python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Característica no disponible en Windows."
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "Encriptación OpenPGP"
+msgstr "Cifrado del mensaje OpenPGP"
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
-msgstr "Cifrado de conversaciones con claves gpg"
+msgstr "Cifrar conversaciones con claves gpg"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Requiere gpg y python-GnuPGInterface."
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
-msgstr "Histórico"
+msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Autodetección del estado de la red."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requiere gnome-network-manager y python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Gestión de sesiones"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "La sesión de Gajim se guarda al desconectar y se restaura al conectar."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Requiere python-gnome2."
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Contraseña para entrar al salón"
+msgstr "Cifrado de la contraseña"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Las contraseñas se pueden guardar de forma segura y no sólo en texto plano."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Requiere gnome-keyring y python-gnome2-desktop."
+msgstr "Requiere gnome-keyring y python-gnome2-desktop, o kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Posibilidad de conectar a servidores que usen registros SRV"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Requiere dnsutils"
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Requiere nslookup para usar los registros SRV."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Corrector ortográfico"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Corrección ortográfica de los mensjes compuestos."
 
-#: ../src/features_window.py:80
-#, fuzzy
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
-msgstr "Requiere python-sexy"
+msgstr "Requiere libgtkspell."
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
 msgstr "Notificaciones"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Mensajes emergentes pasivas para nuevos eventos."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7522,53 +7656,32 @@ msgstr ""
 "Requiere python-notify o python-dbus en conjunción con notification-daemon "
 "en su lugar-"
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Icono del área de notificación"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Un icono en el área de notificación reflejando la presencia actual."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Requiere python-gnome2-extras o el módulo trayicon compilado de las fuentes "
-"de Gajim."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Requiere PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
-msgstr "_Ajustar al estado"
+msgstr "Estado automático"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Posibilidad de medir el tiempo de inactividad para definir el auto-estado."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
-msgstr ""
+msgstr "Requiere la librería libxss."
 
-#: ../src/features_window.py:93
-#, fuzzy
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
-msgstr "Requiere python-gnome2."
+msgstr "Requiere python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformar expresiones LaTeX entre $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7576,7 +7689,7 @@ msgstr ""
 "Requiere texlive-latex-base y dvipng. Tienes que definir 'use_latex' a True "
 "en el Editor de Configuración Avanzada."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7584,25 +7697,23 @@ msgstr ""
 "Requiere textlive-latex-base y dvipng (Todo está en MikTeX). Tienes que "
 "definir 'use_latex' a True en el Editor de Configuración Avanzada."
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "Cifrado End to End"
+msgstr "Cifrado de mensajes End to End"
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Cifrando conversaciones."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Requiere python-crypto"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "Generador RST"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7610,23 +7721,32 @@ msgstr ""
 "Generar salida XHTML partiendo de un código RST (mira http://docutils."
 "sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Requiere python-docutils"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Banners y enlaces clickables"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Posibilidad de hacer URLs clickables en las ventanas de charla"
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Requiere python-sexy"
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Requiere python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Característica"
 
@@ -7642,107 +7762,106 @@ msgstr "Hora"
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Nombre de archivo: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Tú"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Recipiente: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado en: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Transferencia de archivo finalizada"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivo cancelada"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "La conexión con el cliente no se pudo establecer."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipiente: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaje de error: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Elige archivo a enviar..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Descripción: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim no puede acceder a este archivo"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Este archivo está siendo usado por otro proceso."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Archivo: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:888
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "No se puede sobreescribir el archivo existente \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:890
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7750,33 +7869,33 @@ msgstr ""
 "Un archivo con este nombre ya existe y no tienes permisos para "
 "sobreescribirlo"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:894
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:894
 msgid "What do you want to do?"
 msgstr "¿Qué quieres hacer?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:901
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "No se puede escribir en el directorio \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:902
 msgid "You do not have permission to create files in this directory."
 msgstr "No tienes permisos para crear archivos en este directorio."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Guardar archivo como..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7784,32 +7903,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Archivo no válido"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Archivo: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pausa"
 
@@ -7820,27 +7939,27 @@ msgstr "Gajim necesita el servidor X para para funcionar. Abortando..."
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "falló el importado de PyGTK: %s"
 
 #: ../src/gajim.py:180
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim necesita PyGTK 2.8 o superior"
+msgid "Gajim needs PyGTK 2.16 or above"
+msgstr "Gajim necesita PyGTK 2.12 o superior"
 
 #: ../src/gajim.py:181
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim necesita PyGTK 2.8 o superior para funcionar. Abortando..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgstr "Gajim necesita PyGTK 2.12 o superior para funcionar. Abortando..."
 
 #: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim necesita GTK 2.8 o superior"
+msgid "Gajim needs GTK 2.16 or above"
+msgstr "Gajim necesita GTK 2.12 o superior"
 
 #: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim necesita GTK 2.8 o superior para funcionar. Abortando..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgstr "Gajim necesita GTK 2.12 o superior para funcionar. Abortando..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7880,11 +7999,11 @@ msgstr ""
 "obtenerlo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:327
 msgid "Gajim is already running"
 msgstr "Gajim ya se encuentra en ejecución"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:328
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7892,465 +8011,28 @@ msgstr ""
 "Otra instancia de Gajim parece estar ya en ejecución\n"
 "¿Ejecutar otra?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Contraseña requerida"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr ""
-"Introduce la contraseña GPG para la clave %(keyid)s (cuenta %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Ninguna clave GPG asignada"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Te conectarás a %s sin OpenPGP"
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Contraseña equivocada"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Tu alias deseado en el grupo de charla %s está en uso o registrado por otro "
-"ocupante.\n"
-"Especifica otro alias abajo:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "¿Aceptas esta petición?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "¿Aceptas esta petición en la cuenta %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Autorización HTTP (%(method)s) para %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Falló la conexión"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Error %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "error mientras se enviaba %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Petición de adición"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorización aceptada"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "El contacto \"%s\" eliminó su subscripción de tí"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Siempre le verás desconectado.\n"
-"¿Le quieres eliminar de tu lista de contactos?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Eliminar"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "No se ha podido establecer contacto con \"%s\""
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s ahora es conocido como %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s está ahora %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s ha cambiado el asunto a %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Cualquier ocupante puede ver tu JID completo"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "El salón ahora muestra miembros no disponibles"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "el salón ahora no muestra miembros no disponibles"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Ha ocurrido un cambio en el salón no relacionado con la privacidad"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Ha sido activado el registro del salón"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "El salón está ahora deshabilitado"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "El salón es ahora no-anónimo"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "El salón es ahora semi-anónimo"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "El salón es ahora completamente anónimo"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Se requiere una contraseña para entrar al salón %s. Introdúcela."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Configuraste Gajim para usar un agente GPG, pero no hay ningún agente en "
-"ejecución o el mismo devolvió una contraseña errónea.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Estás actualmente conectado sin tu clave GPG"
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Contraseña incorrecta"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Contraseña incorrecta"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG no es usable"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"No se ha asignado una clave GPG a este contacto. No podrás cifrar mensajes."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_No preguntarme otra vez"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring está instalado pero no fue \t\t\t\t\t\t\tiniciado "
-"correctamente (la variable de entorno probablemente no fue \t\t\t\t\t\t"
-"\tcorrectamente definida)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Correo nuevo en %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Tienes %d nueva conversación de correo"
-msgstr[1] "Tienes %d nuevas conversaciones de correo"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"De: %(from_address)s\n"
-"Asunto: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s quiere enviarte un archivo."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Elimina contacto del roster"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Error leyendo el archivo:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Has recibido con éxito el archivo %(filename)s de %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Transferencia de %(filename)s a %(name)s detenida."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"No se puede descifrar el mensaje de %s\n"
-"Es posible que haya sido manipulado."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "No se puede descifrar el mensaje"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Conflicto con nombre de usuario"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Por favor, escribe un nuevo nombre de usuario para tu cuenta local"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Error."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Conflicto en el recurso"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Ya estás conectado a esta cuenta con el mismo recurso. Por favor escribe uno "
-"nuevo"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Error verificando el certificado SSL"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Ocurrió un error verificando el certificado SSL de tu servidor jabber: %"
-"(error)s\n"
-"¿Aún quieres conectarte a este servidor?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignorar este error para este certificado"
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Error del certificado SSL"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Parece que el certificado SSL fue cambiado o tu conexión está siendo "
-"hackeada.\n"
-"Antigua huella: %(old)s\n"
-"Nueva huella: %(new)s\n"
-"\n"
-"¿Aún quieres conectar y actualizar la huella del certificado?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Conexión no segura"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Vas a enviar tu contraseña en una conexión no cifrada- ¿Estás seguro de "
-"querer hacer esto?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Sí, quiero conectarme de forma no segura"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Vas a enviar tu contraseña a través de una conexión no segura. Deberías "
-"instalar PyOpenSSL para prevenirlo. ¿Estás seguro de que quieres hacerlo?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "El nodo PEP no fue eliminado"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "El nodo PEP %(node)s no se pudo eliminar: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Emoticonos desactivados"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"No se pudo encontrar tu tema de emoticonos configurado, los emoticonos han "
-"sido desactivados."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"No se pudo cargar tu tema de emoticonos configurado. Podrías necesitar "
-"actualizar el formato del archivo emoticons.py. Mira http://trac.gajim.org/"
-"wiki/Emoticons para más detalles."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "No puedes entrar a un grupo de charla estando invisible"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "No se pueden guardar las preferencias"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Muestra ayuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Muestra u oculta la ventana de la lista de contactos"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Levanta una venana con el siguiente evento pendiente"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8358,51 +8040,51 @@ msgstr ""
 "Muestra una lista de todos los contactos en el roster. Cada contacto aparece "
 "en una línea separada"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "cuenta"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "mostrar sólo contactos de la cuenta especificada"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Muestra una lista de cuentas registradas"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "mensaje"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "ensaje de estado"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8411,22 +8093,22 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Pr_ioridad:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8436,23 +8118,23 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Muestra el diálogo de conversación para enviar mensajes a un contacto"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contacto con el que quieres conversar"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "si es especificado, el contacto es obtenido de la lista de esta cuenta"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "contenido del mensaje. Se debe especificar la cuenta o \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8462,29 +8144,29 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "contenido del mensaje"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "clave pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "si es especificado, el mensaje será cifrado usando su clave pública"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "si es especificado el mensaje será enviado a través de esta cuenta"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8494,138 +8176,138 @@ msgstr ""
 "como la cuenta son opcionales. Si quieres definir sólo 'cuenta' sin 'clave "
 "pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema del mensaje"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Envía un nuevo mensaje a un grupo de charla al que hayas entrado"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "La JID del salón que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Obtener información detallada de un contacto"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de una cuenta"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nombre de la cuenta"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "archivo"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "si es especificado el archivo será enviado usando esta cuenta"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'entrada' es el nombre de la preferencia, 'valor' es el valor a definir"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nombre de la preferencia a eliminar"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe el estado actual de la preferencias de Gajim al archivo de "
 "configuración"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Elimina contacto del roster"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Añade contacto al roster"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Añade nuevo contacto a esta cuenta."
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devuelve el estado actual (el global si no se especifica una cuenta)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devuelve el mensaje de estado actual (el global si no se especifica una "
 "cuenta)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Devuelve el número de mensajes sin leer"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre el diálogo de iniciar conversación"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversación usando esta cuenta"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8633,72 +8315,71 @@ msgstr ""
 "Cuenta a la que el xml será enviado; si no se especifica nada, el xml será "
 "enviado a todas las cuentas"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Manejar una uri xmpp:/"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI a manejar"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "La cuenta que quieres manejar"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "contenido del mensaje"
+msgstr "Contenido del mensaje"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Entrar en un salón MUC"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "salón"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "JID del salón"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "alias"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Alias a usar"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "contraseña"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Contraseña para entrar al salón"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "La cuenta desde la que quieres entrar al salón"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Comprueba si Gajim se encuentra en ejecución"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Muestra u oculta la ventana ipython"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8707,15 +8388,15 @@ msgstr ""
 "'%s' no está en tu lista de contactos.\n"
 "Por favor, especifica una cuenta para enviar el mensaje."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Parece que Gajim no está en ejecución. No puedes usar gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8724,16 +8405,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8742,7 +8423,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8751,7 +8432,7 @@ msgstr ""
 "Demasiados argumentos. \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8760,7 +8441,7 @@ msgstr ""
 "No se especificó el argumento \"%(arg)s\". \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Uri incorrecta"
 
@@ -8789,152 +8470,176 @@ msgstr "No puedes eliminar el tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:163
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:165
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Ya no estás en el grupo de charla \"%(room)s\" o \"%(nick)s\" se ha ido."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:435
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:613
 msgid "Conversation with "
 msgstr "Conversación con "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:615
 msgid "Continued conversation"
 msgstr "Conversación continuada"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1224 ../src/gui_interface.py:1045
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Cualquier ocupante puede ver tu JID completo"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1227
 msgid "Room logging is enabled"
 msgstr "Registro del salón activado"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1229
 msgid "A new room has been created"
 msgstr "Se ha creado un nuevo salón"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1232
 msgid "The server has assigned or modified your roomnick"
 msgstr "El servidor ha asignado o modificado tu alias en el salón"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1238
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1252
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1268 ../src/groupchat_control.py:1363
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1284 ../src/gui_interface.py:889
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s ahora es conocido como %(new_nick)s"
+
+#: ../src/groupchat_control.py:1322 ../src/groupchat_control.py:1326
+#: ../src/groupchat_control.py:1331
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s ha sido eliminado del salón (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1323
 msgid "affiliation changed"
 msgstr "cambió la afiliación"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1328
 msgid "room configuration changed to members-only"
 msgstr "la configuración del salón cambió a sólo miembros"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1333
 msgid "system shutdown"
 msgstr "apagado del sistema"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1412
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
-"** La afiliación de %(nick)s ha sido definida en &(affiliation)s por %(actor)"
+"** La afiliación de %(nick)s ha sido definida en %(affiliation)s por %(actor)"
 "s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1416
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** La afiliación de %(nick)s ha sido definida en %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1431
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** El rol de %(nick)s ha sido fijado a %(role)s por %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1435
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** El rol de %(nick)s ha sido fijado a %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1464
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1469
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1471 ../src/gui_interface.py:914
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está ahora %(status)s"
+
+#: ../src/groupchat_control.py:1704
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "¿Estás seguro de querer abandonar el salón \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1706
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Si cierras esta ventana, serás desconectado de este grupo de charla."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1710 ../src/gui_interface.py:1165
+#: ../src/gui_interface.py:1924 ../src/gui_interface.py:1959
+#: ../src/message_window.py:227 ../src/roster_window.py:2659
+#: ../src/roster_window.py:3302 ../src/roster_window.py:3991
+msgid "Do _not ask me again"
+msgstr "_No preguntarme otra vez"
+
+#: ../src/groupchat_control.py:1743
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1744
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1751
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1752
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1781
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruyendo %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1782
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8942,22 +8647,22 @@ msgstr ""
 "Vas a destruir definitivamente este salón.\n"
 "Puedes especificar una razón abajo:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1784
 msgid "You may also enter an alternate venue:"
 msgstr "También puedes introducir un lugar alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1965
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1966 ../src/groupchat_control.py:2289
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2288
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -8983,91 +8688,508 @@ msgid "Details"
 msgstr "Detalles"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:202 ../src/gtkgui_helpers.py:217
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:393
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:396
 msgid "Error parsing file:"
 msgstr "Error analizando el archivo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:437
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "No se puede escribir en %s. El soporte de manejo de sesión no funcionará"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:806
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim no es el cliente por defecto de Jabber"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:807
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "¿Quieres hacer de Gajim el cliente por defecto de Jabber?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:808
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Comprobar siempre al inicio si Gajim es el cliente por defecto de Jabber"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:874
 msgid "Extension not supported"
 msgstr "Extensión no soportada"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:875
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "La imagen no se pudo guardar en formato %(type)s. ¿Guardar como %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:911
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Tu alias deseado en el grupo de charla %s está en uso o registrado por otro "
+"ocupante.\n"
+"Especifica otro alias abajo:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Usar este alias siempre que exista un conflicto"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "¿Aceptas esta petición?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "¿Aceptas esta petición en la cuenta %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Autorización HTTP (%(method)s) para %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:203 ../src/notify.py:519
+msgid "Connection Failed"
+msgstr "Falló la conexión"
+
+#: ../src/gui_interface.py:542 ../src/gui_interface.py:546
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Error %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:556 ../src/gui_interface.py:570
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "error mientras se enviaba %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:595 ../src/notify.py:521
+msgid "Subscription request"
+msgstr "Petición de adición"
+
+#: ../src/gui_interface.py:620
+msgid "Authorization accepted"
+msgstr "Autorización aceptada"
+
+#: ../src/gui_interface.py:621
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
+
+#: ../src/gui_interface.py:633
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "El contacto \"%s\" eliminó su subscripción de tí"
+
+#: ../src/gui_interface.py:634
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Siempre le verás desconectado.\n"
+"¿Le quieres eliminar de tu lista de contactos?"
+
+#: ../src/gui_interface.py:658 ../src/notify.py:523
+msgid "Unsubscribed"
+msgstr "Eliminado"
+
+#: ../src/gui_interface.py:699
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "No se ha podido establecer contacto con \"%s\""
+
+#: ../src/gui_interface.py:981
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s ha cambiado el asunto a %(subject)s"
+
+#: ../src/gui_interface.py:1048
+msgid "Room now shows unavailable member"
+msgstr "El salón ahora muestra miembros no disponibles"
+
+#: ../src/gui_interface.py:1050
+msgid "room now does not show unavailable members"
+msgstr "el salón ahora no muestra miembros no disponibles"
+
+#: ../src/gui_interface.py:1053
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "Ha ocurrido un cambio en el salón no relacionado con la privacidad"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1056
+msgid "Room logging is now enabled"
+msgstr "Ha sido activado el registro del salón"
+
+#: ../src/gui_interface.py:1058
+msgid "Room logging is now disabled"
+msgstr "El salón está ahora deshabilitado"
+
+#: ../src/gui_interface.py:1060
+msgid "Room is now non-anonymous"
+msgstr "El salón es ahora no-anónimo"
+
+#: ../src/gui_interface.py:1063
+msgid "Room is now semi-anonymous"
+msgstr "El salón es ahora semi-anónimo"
+
+#: ../src/gui_interface.py:1066
+msgid "Room is now fully-anonymous"
+msgstr "El salón es ahora completamente anónimo"
+
+#: ../src/gui_interface.py:1098
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Se requiere una contraseña para entrar al salón %s. Introdúcela."
+
+#: ../src/gui_interface.py:1130
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Configuraste Gajim para usar un agente GPG, pero no hay ningún agente en "
+"ejecución o el mismo devolvió una contraseña errónea.\n"
+
+#: ../src/gui_interface.py:1132 ../src/gui_interface.py:1138
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Estás actualmente conectado sin tu clave GPG"
+
+#: ../src/gui_interface.py:1133
+msgid "Your passphrase is incorrect"
+msgstr "Contraseña incorrecta"
+
+#: ../src/gui_interface.py:1137
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Contraseña incorrecta"
+
+#: ../src/gui_interface.py:1163
+msgid "GPG key not trusted"
+msgstr "GPG no confiable"
+
+#: ../src/gui_interface.py:1163
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"No se confía en la clave GPG usada para cifrar esta conversación. ¿Realmente "
+"quieres cifrar este mensaje?"
+
+#: ../src/gui_interface.py:1175
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring está instalado pero no fue iniciado \t\t\t\tcorrectamente "
+"(probablemente la variable del entorno no esté \t\t\t\tcorrectamente "
+"definida)"
+
+#: ../src/gui_interface.py:1283
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Correo nuevo en %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1285
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Tienes %d nueva conversación de correo"
+msgstr[1] "Tienes %d nuevas conversaciones de correo"
+
+#: ../src/gui_interface.py:1298
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"De: %(from_address)s\n"
+"Asunto: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1366
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s quiere enviarte un archivo."
+
+#: ../src/gui_interface.py:1403 ../src/roster_window.py:1813
+msgid "Remote contact stopped transfer"
+msgstr "El contacto remoto detuvo la transferencia"
+
+#: ../src/gui_interface.py:1405 ../src/roster_window.py:1815
+msgid "Error opening file"
+msgstr "Error abriendo el archivo:"
+
+#: ../src/gui_interface.py:1436
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Has recibido con éxito el archivo %(filename)s de %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1440
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
+
+#: ../src/gui_interface.py:1453
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1457
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Transferencia de %(filename)s a %(name)s detenida."
+
+#: ../src/gui_interface.py:1562
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"No se puede descifrar el mensaje de %s\n"
+"Es posible que haya sido manipulado."
+
+#: ../src/gui_interface.py:1569
+msgid "Unable to decrypt message"
+msgstr "No se puede descifrar el mensaje"
+
+#: ../src/gui_interface.py:1643
+msgid "Username Conflict"
+msgstr "Conflicto con nombre de usuario"
+
+#: ../src/gui_interface.py:1644
+msgid "Please type a new username for your local account"
+msgstr "Por favor, escribe un nuevo nombre de usuario para tu cuenta local"
+
+#: ../src/gui_interface.py:1656
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1669
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1680
+msgid "Error."
+msgstr "Error."
+
+#: ../src/gui_interface.py:1707
+msgid "Resource Conflict"
+msgstr "Conflicto en el recurso"
+
+#: ../src/gui_interface.py:1708
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Ya estás conectado a esta cuenta con el mismo recurso. Por favor escribe uno "
+"nuevo"
+
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1755
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s quiere enviarte un archivo."
+
+#: ../src/gui_interface.py:1758
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Petición de transferencia de archivo"
+
+#: ../src/gui_interface.py:1863
+msgid "Error verifying SSL certificate"
+msgstr "Error verificando el certificado SSL"
+
+#: ../src/gui_interface.py:1864
+#, 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 ""
+"Ocurrió un error verificando el certificado SSL de tu servidor jabber: %"
+"(error)s\n"
+"¿Aún quieres conectarte a este servidor?"
+
+#: ../src/gui_interface.py:1869
+msgid "Ignore this error for this certificate."
+msgstr "Ignorar este error para este certificado"
+
+#: ../src/gui_interface.py:1889
+msgid "SSL certificate error"
+msgstr "Error del certificado SSL"
+
+#: ../src/gui_interface.py:1890
+#, python-format
+msgid ""
+"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 ""
+"Parece que el certificado SSL de la cuenta %(account)s ha cambiado o tu "
+"conexión está siendo hackeada.\n"
+"Antigua huella: %(old)s\n"
+"Nueva huella: %(new)s\n"
+"\n"
+"¿Aún quieres conectar y actualizar la huella del certificado?"
+
+#: ../src/gui_interface.py:1920 ../src/gui_interface.py:1955
+msgid "Insecure connection"
+msgstr "Conexión no segura"
+
+#: ../src/gui_interface.py:1921
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Vas a enviar tu contraseña en una conexión no cifrada- ¿Estás seguro de "
+"querer hacer esto?"
+
+#: ../src/gui_interface.py:1923 ../src/gui_interface.py:1958
+msgid "Yes, I really want to connect insecurely"
+msgstr "Sí, quiero conectarme de forma no segura"
+
+#: ../src/gui_interface.py:1956
+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 ""
+"Vas a enviar tu contraseña a través de una conexión no segura. Deberías "
+"instalar PyOpenSSL para prevenirlo. ¿Estás seguro de que quieres hacerlo?"
+
+#: ../src/gui_interface.py:1976
+msgid "PEP node was not removed"
+msgstr "El nodo PEP no fue eliminado"
+
+#: ../src/gui_interface.py:1977
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "El nodo PEP %(node)s no se pudo eliminar: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2531 ../src/gui_interface.py:2553
+msgid "Emoticons disabled"
+msgstr "Emoticonos desactivados"
+
+#: ../src/gui_interface.py:2532
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"No se pudo encontrar tu tema de emoticonos configurado, los emoticonos han "
+"sido desactivados."
+
+#: ../src/gui_interface.py:2554
+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 ""
+"No se pudo cargar tu tema de emoticonos configurado. Podrías necesitar "
+"actualizar el formato del archivo emoticons.py. Mira http://trac.gajim.org/"
+"wiki/Emoticons para más detalles."
+
+#: ../src/gui_interface.py:2582 ../src/roster_window.py:3442
+msgid "You cannot join a group chat while you are invisible"
+msgstr "No puedes entrar a un grupo de charla estando invisible"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2949
+msgid "Could not save your settings and preferences"
+msgstr "No se pueden guardar las preferencias"
+
+#: ../src/gui_interface.py:3441
+msgid "Passphrase Required"
+msgstr "Contraseña requerida"
+
+#: ../src/gui_interface.py:3442
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr ""
+"Introduce la contraseña GPG para la clave %(keyid)s (cuenta %(account)s)."
+
+#: ../src/gui_interface.py:3456
+msgid "GPG key expired"
+msgstr "La clave GPG expiró"
+
+#: ../src/gui_interface.py:3457
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Tu clave GPG ha expirado, te conectarás a %s sin OpenPGP"
+
+#. ask again
+#: ../src/gui_interface.py:3466
+msgid "Wrong Passphrase"
+msgstr "Contraseña equivocada"
+
+#: ../src/gui_interface.py:3467
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Nuevo grupo de charla"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "No se puede encontrar la base de datos del historial"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Contactos"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Fecha"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Alias"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9075,7 +9197,7 @@ msgstr ""
 "¿Quieres limpiar la base de datos? (TOTALMENTE DESACONSEJADO SI GAJIM ESTÁ "
 "EN EJECUCIÓN)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 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 "
@@ -9089,193 +9211,190 @@ msgstr ""
 "\n"
 "En caso de elegir SI, por favor, espera..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Exportando historial..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dijo: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:572
 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] "¿Realmente quieres eliminar el historial del contacto seleccionado?"
 msgstr[1] ""
 "¿Realmente quieres eliminar el historial de los contactos seleccionados?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Esta es una operación irreversible"
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "¿Realmente quieres eliminar el mensaje seleccionado?"
 msgstr[1] "¿Realmente quieres eliminar los mensajes seleccionados?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversaciones con %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Error de disco"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está ahora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensaje de error: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 #, fuzzy
 msgid "Error"
 msgstr "Error."
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Expiró el tiempo para cargar la imagen"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "La imagen es demasiado grande"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "No estás conectado al servidor"
+msgstr "Estás a punto de cerrar varias pestañas"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "¿Realmente quieres eliminar el mensaje seleccionado?"
+msgstr "¿Realmente quieres cerrarlas todas?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Conversaciones privadas"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- los mensajes serán registrados"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- los mensajes no serán registrados"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambió su estado"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se ha conectado"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se ha desconectado"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:277
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:284
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuevo mensaje privado desde el grupo de charla %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:286
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:289
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Enviado por %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:294
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:561
 msgid "Ignore"
-msgstr "_Ignorar"
+msgstr "Ignorar"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2846
 msgid "File is empty"
 msgstr "El archivo está vacío"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2849
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2851 ../src/roster_window.py:2862
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Sin una conexión no puedes publicar tu información de contacto."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Enviando perfil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Información NO publicada"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9283,46 +9402,51 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1870
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1871
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1893
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1894
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" acepta esta petición podrás saber su estado."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1908
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1909
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1937
 msgid "GPG is not usable"
 msgstr "GPG no es usable"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1938
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Te conectarás a %s sin OpenPGP"
+
+#: ../src/roster_window.py:2147 ../src/roster_window.py:3395
 msgid "You are participating in one or more group chats"
 msgstr "Estás participando en uno o más grupos de charla"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3396
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9330,28 +9454,27 @@ msgstr ""
 "Cambiando tu estado a invisible provocará tu desconexión de los grupos de "
 "charla. ¿Estás seguro de querer ser invisible?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2174
 msgid "desync'ed"
 msgstr "desincronizado"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2235
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "¿Cerrar realmente Gajim?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2236
 msgid "Are you sure you want to quit Gajim?"
-msgstr "¿Estás seguro de querer abandonar los salones \"%s\"?"
+msgstr "¿Estás seguro de que quieres cerrar Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2237
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Siempre cerrar Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2332 ../src/roster_window.py:2577
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2333
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9359,27 +9482,27 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado y el contacto está en tu roster."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2578
 msgid "You must read them before removing this transport."
 msgstr "Debes leerlos antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2581
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2582
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "Ya no podrás enviar y recibir mensajes de contactos que usen este transporte"
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2585
 msgid "Transports will be removed"
 msgstr "Los transportes serán eliminados"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2590
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9387,68 +9510,68 @@ msgid ""
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos de estos transportes: %s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2654
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2656
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2742
 msgid "Rename Contact"
 msgstr "Renombrar contacto"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2743
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduce un nuevo alias para el contacto %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2750
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2751
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduce un nuevo nombre para el grupo %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2792
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2793
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "¿Quieres eliminar el grupo %s del roster?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2794
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Eliminar del roster también a todos los contactos dentro del grupo"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2833
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2834
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3211
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3213
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
-msgstr ""
+msgstr "Vas a eliminar a \"%(name)s\" (%(jid)s) de tu roster.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3218
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9457,11 +9580,11 @@ msgstr ""
 "resultante y el/ella siempre te verán desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3224
 msgid "Do you want to continue?"
 msgstr "¿Quieres continuar?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3227
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9469,16 +9592,16 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3230
 msgid "I want this contact to know my status after removal"
 msgstr "Quiero que este contacto conozca mi estado después de la eliminación"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3234
 msgid "Contacts will be removed from your roster"
 msgstr "Los contactos serán eliminados de tu roster"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3239
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9488,32 +9611,32 @@ msgstr ""
 "también estás eliminando las autorizaciones resultantes y ellos siempre te "
 "verán desconectado."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3296
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3298
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3317
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3318
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debes crear una cuenta antes de poder conversar con otros contactos."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3898
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3900
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9521,12 +9644,12 @@ msgstr ""
 "Tu servidor no soporta almacenar información de metacontactos. Luego toda la "
 "información referente no se guardará en la próxima reconexión."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3985
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3987
 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 "
@@ -9536,23 +9659,23 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de Jabber "
 "o cuentas de transportes."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4102
 msgid "Invalid file URI:"
 msgstr "URI de archivo no válido:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4113
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Quieres enviar este archivo a %s:"
 msgstr[1] "Quieres enviar estos archivos a %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4228
+#, python-format
 msgid "Send %s to %s"
-msgstr "Enviar %s"
+msgstr "Enviar %s a %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4234
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Hacer %s y %s metacontactos"
@@ -9562,157 +9685,157 @@ msgstr "Hacer %s y %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4719 ../src/roster_window.py:4790
+#: ../src/roster_window.py:4799 ../src/statusicon.py:245
+#: ../src/statusicon.py:292 ../src/statusicon.py:298
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4806
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4811
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4848 ../src/statusicon.py:308
 msgid "_Manage Bookmarks..."
 msgstr "Gestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4868
 #, python-format
 msgid "of account %s"
 msgstr "de la cuenta %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4908
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4964 ../src/roster_window.py:5062
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4988
 msgid "Publish Tune"
 msgstr "Hora de publicación"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4996
 msgid "Configure Services..."
 msgstr "Configurar servicios..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5140
 msgid "_Maximize All"
 msgstr "_Maximizar todo"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5148 ../src/roster_window.py:5316
 msgid "Send Group M_essage"
 msgstr "Enviar mensaje a grupo"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5156
 msgid "To all users"
 msgstr "A todos los usuarios"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5160
 msgid "To all online users"
 msgstr "A todos los usuarios en línea"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5336
 msgid "_Manage Contacts"
 msgstr "_Gestionar contactos"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5344
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5399
 msgid "Send Single Message"
 msgstr "Enviar mensaje"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5445
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5455
 msgid "_Manage Transport"
 msgstr "_Gestionar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5463
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5472
 msgid "_Rename"
 msgstr "Renombrar"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5533
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5547
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5629
 msgid "History Manager"
 msgstr "Histórico"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5640
 msgid "_Join New Group Chat"
 msgstr "_Entrar en nuevo grupo de charla"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5807
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Esperando resultados"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Error en la información recibida del formulario"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Sin resultados"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Error de escritura en disco"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Confirma estas opciones de la sesión"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9727,7 +9850,7 @@ msgstr ""
 "\n"
 "\t¿Son aceptables estas opciones?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9742,116 +9865,116 @@ msgstr ""
 "\n"
 "¿Continuar con la sesión?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:322
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de este grupo de conversación"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [bloqueado]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [minimizado]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Subscripción: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Música:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servicio no ha respondido todavía con información detallada"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9859,29 +9982,28 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
-msgstr "Desconocido"
+msgstr "Desconocida"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliación:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9889,7 +10011,7 @@ msgstr ""
 "Este contacto está interesado en la información de tu presencia, pero tú no "
 "lo estás en la suya"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9897,14 +10019,14 @@ msgstr ""
 "Estás interesado en la información de la presencia del contacto, pero él/"
 "ella no lo está en la tuya"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tanto tú como el contacto estáis interesados en la información de la "
 "presencia del otro"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9912,19 +10034,80 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Estás esperando la respuesta del contacto acerca de tu petición de adición"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "No hay ninguna suscripción pendiente."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "Mens_aje entrante:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "Mensaje saliente:"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "falta la dependencia pysqlite2 (tcc python-pysqlite2). Saliendo..."
+
+#~ msgid ""
+#~ "Session bus is not available.\n"
+#~ "Try reading http://trac.gajim.org/wiki/GajimDBus"
+#~ msgstr ""
+#~ "Bus de la sesión no disponible.\n"
+#~ "Prueba leyendo http://trac.gajim.org/wiki/GajimDBus"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "El host %s que configuraste como la opción avanzada "
+#~ "ft_override_host_to_send no es válido, será ignorado."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "No se ha facilitado la clave OpenPGP"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Para continuar enviando y reciviendo mensajes, necesitarás volver a "
+#~ "conectar."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "No estás conectado o estás invisible a los demás. Tu mensaje no pudo ser "
+#~ "enviado."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Este mensaje está cifrado]"
+
+#~ msgid "%i days ago"
+#~ msgstr "hace %i días"
+
+#~ msgid "Trayicon"
+#~ msgstr "Icono del área de notificación"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Un icono en el área de notificación reflejando la presencia actual."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Requiere python-gnome2-extras o el módulo trayicon compilado de las "
+#~ "fuentes de Gajim."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Requiere PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Añadir _notificación especial"
 
@@ -9971,11 +10154,9 @@ msgstr " recurso con prioridad "
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
-#, fuzzy
 #~ msgid "Nickname not found"
-#~ msgstr "Alias no encontrado: %s"
+#~ msgstr "Alias no encontrado"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -9984,7 +10165,7 @@ msgstr " recurso con prioridad "
 #~ "Uso: /%s <alias|JID> [motivo], expulsa el JID del grupo de charla. El "
 #~ "alias de un ocupante puede ser sustituido, pero no si contiene \"@\". Si "
 #~ "el JID está actualmente en el grupo de conversación, el/ella será también "
-#~ "expulsado. NO soporta espacio en el alias."
+#~ "expulsado."
 
 #~ msgid ""
 #~ "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -10014,14 +10195,12 @@ msgstr " recurso con prioridad "
 #~ "Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
 #~ "opcionalmente usando el alias especificado"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
 #~ "nickname from the group chat and optionally displays a reason."
 #~ msgstr ""
 #~ "Uso: /%s <alias> [motivo], elimina del salón al ocupante especificado por "
-#~ "el alias y opcionalmente muestra un motivo. NO soporta espacios en el "
-#~ "alias."
+#~ "el alias y opcionalmente muestra un motivo."
 
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -10045,11 +10224,18 @@ msgstr " recurso con prioridad "
 #~ "Usage: /%s <message>, sends a message without looking for other commands."
 #~ msgstr "Uso: /%s <mensaje>, envía un mensaje sin buscar otros comandos."
 
-#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
+#~ "messages."
+#~ msgstr ""
+#~ "Uso: /%s <nickname>, previene a <nickname> enviarte mensajes o "
+#~ "conversaciones."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
 #~ "messages."
-#~ msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
+#~ msgstr ""
+#~ "Uso: /%s <alias>, permite a <nickname> enviarte mensajes y conversaciones."
 
 #~ msgid "Your JID:"
 #~ msgstr "Tu JID"
@@ -10241,9 +10427,6 @@ msgstr " recurso con prioridad "
 #~ "no te preguntará más por un mensaje de estado cuando cambies tu estado a "
 #~ "ausente; simplemente aplicará el mensaje predefinido para ausente"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "Ant_es del alias:"
-
 #~ msgid "Chat"
 #~ msgstr "Charla"
 
@@ -10821,9 +11004,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Open Download Page"
 #~ msgstr "Abrir página de descarga"
 
-#~ msgid "Session bus is not available."
-#~ msgstr "El bus de la sesión no está disponible."
-
 #~ msgid "with account "
 #~ msgstr "cuenta: "
 
diff --git a/po/eu.po b/po/eu.po
index 1d8f7c8b1..c1c9aabb1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-19 23:50+0200\n"
 "Last-Translator: Urtzi  <>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -290,9 +290,9 @@ msgstr "Informazio Pertsonala Editatu..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -301,9 +301,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Orokorra"
 
@@ -364,21 +364,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Zuri buzuzko informazioa zerbitzarian gordea izango da"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Ezer ez"
 
@@ -538,8 +538,8 @@ msgstr ""
 "You might consider to change possible firewall settings."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -553,7 +553,7 @@ msgid "Mer_ge accounts"
 msgstr "_Batu kontuak"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
@@ -969,7 +969,7 @@ msgstr "Azken Eraldaketa:"
 msgid "New entry received"
 msgstr "Ekintza berri bat jasoa"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Sarrera berri bat jaso duzu:"
 
@@ -1017,12 +1017,12 @@ msgstr "Sartu pasahitz berria:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Egoera mezu berria ezarri</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Aktibatuta"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Gela:"
@@ -1117,8 +1117,8 @@ msgstr "Editatu _Taldeak"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "Honera gonbidatu"
 
@@ -1133,8 +1133,8 @@ msgid "Remo_ve"
 msgstr "_Ezabatu"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sends custom XML"
@@ -1170,8 +1170,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Baimendu nire egoera ikustea"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1182,7 +1182,7 @@ msgstr "Debekatu nire egoera ikustea"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Historiala"
 
@@ -1205,8 +1205,8 @@ msgid "_Subscription"
 msgstr "Har_pidetza"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
@@ -1303,7 +1303,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Jarraitu"
 
@@ -1311,7 +1311,7 @@ msgstr "_Jarraitu"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Jakinarazi  fitxeroa transferitu denean"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Ireki Fitxeroaren Edukia"
 
@@ -1339,7 +1339,7 @@ msgstr ""
 "Kontaktu zerrenda\n"
 "Banner Elkarrizketa "
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Negrita"
 
@@ -1359,11 +1359,11 @@ msgstr "Gajim-en Gaien Kustomizatazailea"
 msgid "Gone"
 msgstr "Joanda"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiboa"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Etzana"
 
@@ -1414,7 +1414,7 @@ msgstr "Aldatu _Gaia"
 msgid "Configure _Room..."
 msgstr "Gela Konfigu_ratu"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Talde Agendan Sartu Gela hau"
@@ -1511,8 +1511,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim Historialeko Log Administratzailea"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -1537,7 +1538,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Bilatu Datu Basean"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Elkarrizketaren Historiala"
 
@@ -1563,7 +1564,7 @@ msgstr "Elkarrizketaren _historiala"
 msgid "Bookmark this room"
 msgstr "_Talde Agendan Sartu Gela hau"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
@@ -1591,8 +1592,8 @@ msgstr "Berriki:"
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Sartu"
 
@@ -1620,7 +1621,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Inprimatu egoera:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
@@ -1744,17 +1745,26 @@ msgid "Show a list of formattings"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Bidali"
 
@@ -1880,7 +1890,7 @@ msgstr ""
 "Autodetektatu Gajim abiarazten den bakoitzean\n"
 "Beti GNOME-ren berezko aplikazioak erabili\n"
 "Beti KDE-ren berezko aplikazioak erabili\n"
-"Beti XFCE4-ren berezko aplikazioak erabili\n"
+"Beti Xfce-ren berezko aplikazioak erabili\n"
 "Bezeroa"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1897,6 +1907,16 @@ msgid "Configure color and font of the interface"
 msgstr "Interfazeko kolorea eta letra konfiguratu"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Egoera mezua:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Kontaturen izena"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1905,34 +1925,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Erakutsarazi epostaren g_ehigarrizko xehetasunak"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1942,7 +1962,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "display in chat windows."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1952,7 +1972,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1960,19 +1980,19 @@ msgstr ""
 "Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
 "pantailako beheko eskubiko aldean"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Ezkutatu botoiak txat taldeko leihoan."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1980,18 +2000,18 @@ msgstr ""
 "Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
 "ere jarriko du."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1999,7 +2019,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2007,7 +2027,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
 "azpian eta txat taldeetan"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2015,7 +2035,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2023,7 +2043,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2031,14 +2051,14 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2048,14 +2068,14 @@ msgstr ""
 "Bakarrik hautatu aukera hau zerrendan ez duzun norbaitek zirikatzen bazaitu. "
 "Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak blokeatzen ditu"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2064,7 +2084,7 @@ msgstr ""
 "Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
 "ere jarriko du."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2074,13 +2094,13 @@ msgstr ""
 "ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
 "jarriko dira)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2088,79 +2108,79 @@ msgstr ""
 "Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
 "edo animatura eraldatuko ditu"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "M_ezu leiho bat"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Mo_ldatu..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "Kontu Eraldaketa"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "_Gmail-eko E-posta berri batez jakinarazi"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "Informazio Pertsonala "
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "Iku_si gertaerak systray-ean"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Konektatuta"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Deskonektatuta"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2168,30 +2188,30 @@ msgstr ""
 "Mezu batzuk gehiegizko edukia izan dezakete(koloreak, tamaina...). Hautatua "
 "badago, Gajim-ek testua modu sinple batean erakutsiko du. "
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Egoera"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Berezko egoera _ikurra:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "Style"
 msgstr "Stalled"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "G_aia:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2199,7 +2219,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2207,113 +2227,115 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Erabili _transporteen ikurrak"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "_Sistemaren berezkoa erabili"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Ekintza berri bat jasotzean."
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Errore mezua: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Izengoitia baino l_ehen:"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "Automatikoki _Kanpoan ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticonoak:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Fitxero administratzaile:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ez kasu egin gehiegizko edukiari sarrera mezuetan"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Sarrerako mezua:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Automatikoki _Ez Erabilgarri ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Ireki..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Kanp_oan nagoeneko mezua:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "Be_rezko Koloreak Ezarri"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "Txat Taldean _Sartu"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "Ez dago zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutu"
 
@@ -2366,7 +2388,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Ordena:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Debekatze Zerrenda"
 
@@ -2530,7 +2552,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Ezaugarriak</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Soinuak</b>"
@@ -2594,8 +2616,8 @@ msgstr "Ezabatu kontua Gajim-etik eta baita _zerbitzaritik"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Ezabatu"
 
@@ -2614,14 +2636,14 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Ezabatu"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr "Ezabatu"
 
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
@@ -2682,7 +2704,7 @@ msgstr "_Aukerak"
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Editatu"
 
@@ -2726,12 +2748,12 @@ msgid "_Add contact"
 msgstr "Kontaktua _Sartu"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 #, fuzzy
 msgid "_Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Bilatu"
 
@@ -2751,10 +2773,6 @@ msgstr "Erregistratu honetara"
 msgid "_Cancel"
 msgstr "_kantzelatu"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2972,338 +2990,325 @@ msgstr "Baliabidea:"
 msgid "Status:"
 msgstr "Egoera:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Activated"
 msgstr "Aktibatuta"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Deactivated"
 msgstr "Inaktiboa"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 #, fuzzy
 msgid "Integer"
 msgstr "Taldean"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Izen Hautapena"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Balorea"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Mota"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Ezer ez)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Ikusezin"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Sarrera berri bat jaso duzu:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Sarrera berri bat jaso duzu:"
+msgstr[1] "Sarrera berri bat jaso duzu:"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Ingelesa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgariera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgariera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Alemaniera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Greziera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "British"
 msgstr "Briton"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperantoa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Gaztelania"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Frantsesa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Kroaziera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italiera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Alemana"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Norwegian"
 msgstr "Norbegiera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polakoa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugesa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brasileko Portugesa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Rusiera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Serbian"
 msgstr "Alemaniera"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Eslovakoa"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Txinera (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Ortografia hizkuntza"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "bederatzi"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Izengoitia"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "_Mota:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "Erabili autentifikazioa"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Erabili autentifikazioa"
@@ -3311,58 +3316,58 @@ msgstr "Erabili autentifikazioa"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3370,22 +3375,22 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
@@ -3394,23 +3399,23 @@ msgstr "%(nick)s orain dago %(status)s"
 msgid "creating logs database"
 msgstr "logs-en datu basea sortzen"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s fitxero bat da baina direktorio bat izan daiteke"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "%s direktorioa sortzen"
@@ -3481,10 +3486,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 #, fuzzy
 msgid "Groupchats"
 msgstr "Txat Taldeak"
@@ -3597,9 +3602,9 @@ msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 #, fuzzy
 msgid "default"
 msgstr "Berezkoa"
@@ -4227,7 +4232,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4235,125 +4240,125 @@ msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP aktibatu al dago kontu honetarako?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "dena edo espazio egoera banandua"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'bai', 'ez', edo 'biak'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'bai', 'ez' edo ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Libre."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Ez Erabilgarri."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Ez nahasi."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Agur!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4361,107 +4366,106 @@ msgstr ""
 "Soinua bat entzun MUC-ak muc_highlight_words-eko hitz bat agertzean edota "
 "gela bateko mezu batek zure izengoitia duenean."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "arrantzale"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Host okerra"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard argitarapena egina"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Baimenik gabeko izengoitia: %s"
@@ -4469,77 +4473,77 @@ msgstr "Baimenik gabeko izengoitia: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Gela sortzea mugatua dago."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Erregistratutako izengoitia erabilia izan behar da."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ez zaude kideen zerrendan."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s -ra harpidetuak gaude orain"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s -ren harpidetzatik kenduta gaude"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4678,187 +4682,184 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Gaia: %s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Manualki konektatu berriro."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Erantzun baliogabea"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "%s gordea"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Gaia: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktua"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Ez bidali ikusezin egoerarengatik"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Begiratzaileak"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transportea"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 #, fuzzy
 msgid "Not in roster"
 msgstr "Ez dago zerrendan"
@@ -5108,7 +5109,7 @@ msgstr "Libre Hitz Egiteko"
 msgid "_Available"
 msgstr "_Libre"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Libre"
 
@@ -5226,77 +5227,77 @@ msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gib"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bidali mezua"
 msgstr[1] "Bidali mezua"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5312,16 +5313,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indeces"
@@ -5331,700 +5332,719 @@ msgstr "migrating logs database to indeces"
 msgid "XMPP account %s@%s"
 msgstr "%s kontukoa"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "Etena"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Negrita"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Brave"
 msgstr "daukadanean"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Txat-ak"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Negrita"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Edukiak"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Osatua"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Edukiak"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Inaktiboa"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Ezabatu"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Disappointed"
 msgstr "Ezindu"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Dismayed"
 msgstr "Ezindu"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Distracted"
 msgstr "Ezindu"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Taldea"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "_Host-a"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "mezua"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Ikusezin"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "bat"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "_Host-a"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Alemaniera"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "_Eraldatu"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Deskonektatuta"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Taldea"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "hamaika"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "Stalled"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "Azken Eraldaketa:"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "Izengoitia"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "Lotan"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Kalea:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Harpidetu"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Denbora"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "bederatzi"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host okerra"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Arratsaldea"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "Sortzen"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "Goiza"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "talde hontakoak"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Arratsaldea"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "Botatzen %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "_Sartu"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Gaia Aldatu"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "Botatzen %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "Botatzen %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "Arrazoia"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Arrazoia"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "Lotan"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Telefonoan nago."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "Tranferitzen"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "Sortzen"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 #, fuzzy
 msgid "On a Train"
 msgstr "Ireki _lotura bezala"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "Sortzen"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "Lanean"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -6047,37 +6067,11 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP pasa-esaldia ez da eman"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "%s konektatu behar zara OpenPGP-rik gabe."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6086,54 +6080,46 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Ezin izan da zerbitzu lokalak hasi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ezin izan da \"%s\" -ren egoera aldatu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Ez zaude konektatuta edo ikusezin zaude. Ezin izan da zure mezua bidali."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Mezu hau enkriptatua dago]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
@@ -6144,26 +6130,26 @@ msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
 msgid "Error while adding service. %s"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Ezindu"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "Berezko Egoera Mezuak"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "Aktibatu"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6172,72 +6158,72 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Birkargatu orain?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Irakurri gabeko gertaerak"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Txat-a %s kontuan ireki duzu"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Kontuko izena aldatzeko,  irakurri gabeko gertaera guztiak irakurri behar "
 "dituzu."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6245,148 +6231,148 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kontuak moldatu"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Kontu bat sortu behar duzu informazio petsonala editatu baino lehen."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Kontu izena jadanik badago"
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Mesedez berridatzi edo ezabatu hori  link-local messaging martxan jarri "
 "baino lehen."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6394,11 +6380,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6406,11 +6392,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6419,11 +6405,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6431,7 +6417,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6448,59 +6434,60 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Berezkoa"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "Denak"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Denak"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6508,31 +6495,31 @@ msgstr ""
 "talde agenda hau ezabatzeaz"
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Baimenik gabeko izengoitia: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 #, fuzzy
 msgid "Invalid server"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6540,34 +6527,34 @@ msgid ""
 "window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6577,7 +6564,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6585,198 +6572,195 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktibatuta"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "GMail posta jasoa"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "At_era"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr " \"%s\" -rako _aukerak"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL hiztegia galdu egin da \"%s\" -an eta ez dago WIKTIONARY-an"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Atzo"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i egun lehenago"
+msgid_plural "%i days ago"
+msgstr[0] "Atzo"
+msgstr[1] "Atzo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "IM Jabber Bezeroa"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktuaren izena: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Taldea"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "Taldean"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "ID kodea"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Kontaturen izena"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ezarri MOTD"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6784,106 +6768,106 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Aurrez Ezarritako Mezua Jarri"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM Hebidea:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG zenbakia:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ zanbakia:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN Helbidea:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Helbide:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Mesedez ezarri sartu nahi duzun kontaktuaren informazioa %s kontuarako"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ Bertsioa:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK Bertsioa:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Egungo diseinatzaileak: "
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Aurre diseinatzaileak: "
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Azkenak baina ez gutxien merezitakoak,\n"
 "eskerrak eman nahi dzkiegu paketeak mantentzen dituztenei."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6894,104 +6878,108 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID gela baliogabea"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "ID Jabber gelak ez du onartzen karaktererik."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Hau ez da txat talde bat"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ez da txat gela baten izena."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7000,301 +6988,330 @@ msgstr ""
 "kontaktuaren Jabber ID-a edota izengoitia:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontua erabiliz"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuan"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "%s naiz"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr " XML Konsola"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Stalled"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "_Eraldatu"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Ezabatu"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
 msgstr "Gehitu"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "_Eraldatu"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Taldea"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Kontaktua _Sartu"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Zerrendatik kontaktua ezabatu"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Agindua: %s, akzioa: %s, mota %s, balorea %s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Agindu: %s, ekintza: %s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Baliogabeko izen zerrenda"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Izen bat sartu beharra duzu debekatze zerrenda bat egiteko."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "nagoenean"
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7302,38 +7319,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7343,31 +7360,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Besteak"
@@ -7377,24 +7413,24 @@ msgstr "Besteak"
 msgid "Conference"
 msgstr "Solasaldiak"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7402,341 +7438,336 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Baliogabeko izena"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Bilatu"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Komandoa Exekutatu..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Deskribapena"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Talde agenda ezarria"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" gela zure talde agendan dago jadanik."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Talde agenda egoki sortu da"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 #, fuzzy
 msgid "Node"
 msgstr "Ezer ez"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Mezu berria"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Azalpenak: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Ireki OpenPGP Enkriptazioa"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "_Sarrerako mezua:"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Kontu Eraldaketa"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Egoerarekin b_at egin"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Ireki OpenPGP Enkriptazioa"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "_Sarrerako mezua:"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Orokorra"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "Zerbitzariaren Ezaugarriak:"
@@ -7753,142 +7784,142 @@ msgstr "Denbora"
 msgid "Progress"
 msgstr "Prozesua"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaina: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Zu"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "%s gordea"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Fitxero transferentzia osatua"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Fitxero transferentzia ezeztatua"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Hartzailea: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Errore mezua: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Deskribapena: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim-ek ezin du fitxero honetan sartu."
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Beste prozesu batek erabiltzen du orain fitxero hau."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Fitxeroa: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Izen honekin dagoeneko badago fitxerorik eta ez duzu baimenik gainarazteko."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Zer nahi duzu egitea?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Gorde Bezala..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7896,32 +7927,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Fitxeroa:"
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Etena"
 
@@ -7990,11 +8021,11 @@ msgstr ""
 "dezakezu hau."
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim dagoeneko abiarazi da"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8002,431 +8033,29 @@ msgstr ""
 "Beste Gajim prozesu bat abiarazita dagoela dirudi\n"
 "Abiarazi dena den?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Pasa-esaldia Behar da"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "%s konektatu behar zara OpenPGP-rik gabe."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Pasa-esaldi okerra"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
-"Mesedez ezarri beste izengoiti bat:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Baimen hau onartzen al duzu?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Baimen hau onartzen al duzu?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Konexioak huts egin du"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "errorea bidaltzen zen bitartean %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Harpidetza Eskaria"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorizazioa baimendua"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Harpidetza ezabat_u"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "\"%s\" ezin izan da kontaktuan jarri"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s orain %s bezala ezaguna da"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s orain dago %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Pasahitza behar da gela honetan sartzeko."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Zure OpenPGP koderik gabe konektatu zara."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Zure pasa-esaldia ez da egokia"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Zure pasa-esaldia ez da egokia"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "E_z galdetu berriro  "
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "E-posta Berria %(gmail_mail_address)s -en"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "%d e-posta elkarrizketa duzu"
-msgstr[1] "%d e-posta elkarrizketa dituzu"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s fitxero bat bidali nahi dizu"
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Zerrendatik kontaktua ezabatu"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Errorea fitxeroa irakurtzean:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Ondo jasoa izan da  %(name)s-ren %(filename)s  fitxeroa."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr ""
-"%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "Mezu _guztietan"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Erabiltze izenarekin gatazka"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Erabiltze izenarekin gatazka"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Konektatu"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Enkriptazioa desaktibatuta"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Agertarazi leiho bat hurrengo irakurri gabeko gertaerarekin"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8435,49 +8064,49 @@ msgstr ""
 "Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan "
 "agertuko dira."
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "kontua"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "Ikusi emandako kontaktuak bakarrik"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Inprimatu erregistratutako kontuen lista"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "egoera"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "mezua"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "egoera mezua"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8486,22 +8115,22 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Lehentas_una:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8511,23 +8140,23 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Txat leihoa erakutsi, honela, kontaktuari mezua bidali diezaiokezu"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "hautatua badago, kontaktua kontu honen kontaktu listatik lortuko da."
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8537,29 +8166,29 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp giltza"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hautatua badago, kode publikoa erabiliz enkriptatuko da mezua"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8569,217 +8198,217 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "gaia"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "mezuaren gaia"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Kontuaren izena"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fitxeroa"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera ezabatu"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "giltza"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim-en berezko preferentzien egoera .config fitxategian idatzi"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Zerrendara kontaktua sartu"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Sartu kontaktu berria kontu honetara"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Oraingo egoera itzuli (Globala, ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Oraingo egoera mezua itzuli (Globala aukeratu ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Irakurri gabeko mezuen kontaketa itzuli"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ireki  'Txat-a Hasi' leiho"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Elkarrizketa hasi, kontu hau rabiliz"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr " XML bidaltzeko"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Gela Berri Sartu"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "room"
 msgstr "-etik"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Gela:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "nick"
 msgstr "Izengoitia"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "password"
 msgstr "Pasahitza:"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8788,31 +8417,31 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8821,7 +8450,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8830,7 +8459,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8839,7 +8468,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Host okerra"
@@ -8870,174 +8499,198 @@ msgstr "Ezin duzu zure berezko gaia ezabatu"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ez zaude gela honetan \"%s\"jadanik edo \"%s\" joan da."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "Elkarrizketaren Historiala"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konektatu"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s debekatu da %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s orain %s bezala ezaguna da"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afizioak: "
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s orain dago %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "E_z galdetu berriro  "
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
@@ -9063,60 +8716,448 @@ msgid "Details"
 msgstr "Zehaztapenak"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Errorea fitxeroa analizatzean:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "ezin izan da  %s-ri idatzi. Sesio administratzailea euskarria ez dago lanean."
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Irudia ezin izan da %(type)s formatuan gorde. Gorde %(new_filename)s bezala?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
+"Mesedez ezarri beste izengoiti bat:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Baimen hau onartzen al duzu?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Baimen hau onartzen al duzu?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Konexioak huts egin du"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "errorea bidaltzen zen bitartean %s ( %s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Harpidetza Eskaria"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorizazioa baimendua"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Harpidetza ezabat_u"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "\"%s\" ezin izan da kontaktuan jarri"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Pasahitza behar da gela honetan sartzeko."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Zure OpenPGP koderik gabe konektatu zara."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Zure pasa-esaldia ez da egokia"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Zure pasa-esaldia ez da egokia"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "E-posta Berria %(gmail_mail_address)s -en"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "%d e-posta elkarrizketa duzu"
+msgstr[1] "%d e-posta elkarrizketa dituzu"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s fitxero bat bidali nahi dizu"
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Zerrendatik kontaktua ezabatu"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Errorea fitxeroa irakurtzean:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Ondo jasoa izan da  %(name)s-ren %(filename)s  fitxeroa."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr ""
+"%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Mezu _guztietan"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Erabiltze izenarekin gatazka"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1721
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Erabiltze izenarekin gatazka"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s fitxero bat bidali nahi dizu"
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Fitxeroa Transferitzeko Baimena"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Konektatu"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Enkriptazioa desaktibatuta"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Pasa-esaldia Behar da"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "%s konektatu behar zara OpenPGP-rik gabe."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Pasa-esaldi okerra"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Nire zerrendara nahi nizuke sartu"
 
@@ -9131,7 +9172,7 @@ msgstr "Kontaktua"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Data"
 
@@ -9142,7 +9183,7 @@ msgstr "Izengoitia"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Mezua"
 
@@ -9167,195 +9208,195 @@ msgstr ""
 "\n"
 "BAI sakatu baduzu, mesedez itxoin..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Historialeko Log-ak Esportatzen...."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s-ean esan du: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Ziur al zaude hautaturiko kontaktuaren log-a ezabatu nahi duzula?"
 msgstr[1] ""
 "Ziur al zaude hautaturiko kontaktuaren log-ak ezabatu nahi dituzula?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Itzulgaitza den operazio bat da hau."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 msgstr[1] "Ziur al zaude hautaturiko mezuak ezabatu nahi dituzula?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Elkarrizketa Historiala %s-rekin"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s orain %(status)s dago: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Errore mezua: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Txat-ak"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Txat Taldeak"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Mezuak"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Egoera Aldatu du"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Konektatuta"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Deskonektatuta"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Mezu Pribatu Berri Bat %s gelatik"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "bederatzi"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Profila jasotzen..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 #, fuzzy
 msgid "File is empty"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 #, fuzzy
 msgid "File does not exist"
 msgstr "Honako gela honek ez du existitzen."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informazioa jasoa"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Profila bidaltzen..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informazio EZ argitaratua"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9363,46 +9404,51 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "\"%s\" harpidetza onartzen baduzu bere egoera ikus ahal izango duzu."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "%s konektatu behar zara OpenPGP-rik gabe."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9410,44 +9456,44 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "Mezuak gero irakurri ahalko dira historiala aktibatua baduzu."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Irakurri behar dituzu transporte hau ezabatu baino lehen."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9456,11 +9502,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transporteak ezabatuko dira"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9469,69 +9515,69 @@ msgstr ""
 "Ezin izango duzu transporte hauetako kontaktuen mezuak jaso ezta bidali ere: "
 "%s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Sartu %s kontaktuarentzat nick berri bat"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Berrrizenpetu Taldea"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Ezabatu Taldea"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ezabatu nahi al duzu %s taldea zerrendatik?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9540,12 +9586,12 @@ msgstr ""
 "deskonektatuta ikusiko zaitu beti."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9553,16 +9599,16 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Kontaktu hau ezabatu ondoren nire egoera jakitea nahi dut"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktuak ezabatuak izango dira zure zerrendatik"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9572,33 +9618,33 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9607,12 +9653,12 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9623,24 +9669,24 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s fitxero bat bidali nahi dizu:"
 msgstr[1] "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Bidali %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
@@ -9650,164 +9696,164 @@ msgstr "Egin %s eta %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz "
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "Talde Agenda _Moldatu..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "%s kontukoa"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Argitaratu"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Zerbitzuak Aurkitu..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "_Bidali Taldeari Mezua"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Kontaktu guztiei"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Konektatutako kontaktu guztiei"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Berridatzi Kontaktua"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Bidali Mezu Bakarra"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Komandoa Exekutatu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportea"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Trans_porteak Erakutsi"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontaktua Deskonektatuta"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "T_xat Talde Berrian Sartu"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Gaia: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9817,7 +9863,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9827,119 +9873,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Baliabideak: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "Gela honetako %(owner_or_admin_or_member)s "
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Egoera: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Azken egoera: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " %s-etik"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "Konektatu"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Harpidetza: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Mota:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Deskargatu"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Kargatu"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Mota: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Osatua"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "Gelditua"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio zehaztuz."
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9947,30 +9993,30 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "noiztik %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikazioak</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9978,7 +10024,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9986,31 +10032,69 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Zu eta kontaktua, bien egoera informazioetan interesatuta zaudete"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Zu ez zaude haren egoera informazioan interesatuta, bera zugan interesa du"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Sarrerako mezua:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "Kanp_oan nagoeneko mezua:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk+"
+
+#, fuzzy
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "The host you configured as the ft_override_host_to_send advanced option "
+#~ "is not valid, so ignored."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP pasa-esaldia ez da eman"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Ez zaude konektatuta edo ikusezin zaude. Ezin izan da zure mezua bidali."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Mezu hau enkriptatua dago]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i egun lehenago"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Gehitu _Noifikazio Berezia"
 
@@ -10298,9 +10382,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ "gehiago galdetuko egoera mezuaz kanpoan egoera ezartzean; ezarritako "
 #~ "erabiliko da beti"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "Izengoitia baino l_ehen:"
-
 #~ msgid "Chat"
 #~ msgstr "Txat"
 
diff --git a/po/fr.po b/po/fr.po
index ea1ccdad8..72bb42a47 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12 svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-19 23:50+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-11-15 15:50+0100\n"
 "Last-Translator: Florent Le Coz <louizatakk@fedoraproject.org>\n"
-"Language-Team:  <>\n"
+"Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,7 +98,7 @@ msgstr "<b>Veuillez choisir un serveur</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -109,9 +109,8 @@ msgstr ""
 "Empreinte digitale SHA1 du certificat :\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Utiliser l'authentification"
+msgstr "Authentification anon_yme"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -287,9 +286,9 @@ msgstr "_Éditer les informations personnelles..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -298,9 +297,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Général"
 
@@ -360,21 +359,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Les informations vous concernant, stockées sur le serveur"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Aucun"
 
@@ -480,7 +479,6 @@ msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
 msgstr "_Ajuster selon l'état"
 
@@ -489,9 +487,8 @@ msgid "Accounts"
 msgstr "Comptes"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Utiliser l'authentification"
+msgstr "Authentification anonyme"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -502,9 +499,8 @@ msgstr ""
 "passe via une connexion non-sécurisée"
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
-msgstr "C_onnexion au démarrage"
+msgstr "C_onnexion au démarrage de Gajim"
 
 #: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
@@ -534,8 +530,8 @@ msgstr ""
 "avez un."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
@@ -549,57 +545,47 @@ msgid "Mer_ge accounts"
 msgstr "_Regrouper les comptes"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Re_nommer"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
-msgstr "Envoi des paquets de maintien de connexion"
+msgstr "Envoi des pa_quets de maintien de connexion"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "S_ynchroniser l'état du compte avec l'état global"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use G_PG Agent"
-msgstr "Utiliser un _Agent GPG"
+msgstr "Utiliser un Agent G_PG"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Utiliser un nom d'hôte/port personnalisé"
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Utiliser un port personnalisé :"
+msgstr "Utiliser un port pers_onnalisé :"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "_Éditer les informations personnelles..."
+msgstr "_Éditer les informations personnelles…"
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Activer"
+msgstr "Activ_er"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
 msgstr "Nom d'_Hôte :"
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Gérer..."
+msgstr "_Gérer..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
 msgstr "_Port :"
 
@@ -608,9 +594,8 @@ msgid "_Warn before using an insecure connection"
 msgstr "_Prévenir avant d'utiliser une connexion non sécurisée"
 
 #: ../data/glade/accounts_window.glade.h:63
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
-msgstr "utiliser la variable d'environnement HTTP_PROXY"
+msgstr "_utiliser la variable d'environnement HTTP__PROXY"
 
 #: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
@@ -959,7 +944,7 @@ msgstr "Dernière modification :"
 msgid "New entry received"
 msgstr "Nouvel événement reçu"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Vous avez publié l'article :"
 
@@ -1003,11 +988,11 @@ msgstr "Entrez un nouveau mot de passe :"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Taper votre nouveau message d'état</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Activité :"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Humeur :"
 
@@ -1087,9 +1072,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Assigner une clé Open_PGP..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Exécuter une commande..."
+msgstr "E_xécuter une commande…"
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1097,8 +1081,8 @@ msgstr "Éditer les _groupes..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "In_viter à"
 
@@ -1111,8 +1095,8 @@ msgid "Remo_ve"
 msgstr "Suppri_mer"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Envoyer un Statut Personnalisé"
 
@@ -1145,8 +1129,8 @@ msgid "_Allow him/her to see my status"
 msgstr "L'autoriser à voir mon état"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Bloquer"
 
@@ -1157,7 +1141,7 @@ msgstr "Interdire de voir mon état"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Historique"
 
@@ -1178,8 +1162,8 @@ msgid "_Subscription"
 msgstr "_Autorisation"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Débloquer"
 
@@ -1271,7 +1255,7 @@ msgstr ""
 "Quand le transfert de fichier est terminé, montrer une fenêtre de "
 "notification"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Continuer"
 
@@ -1279,7 +1263,7 @@ msgstr "_Continuer"
 msgid "_Notify me when a file transfer is complete"
 msgstr "Me _signaler quand un transfert de fichier est terminé"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Ouvrir le répertoire de destination"
 
@@ -1307,7 +1291,7 @@ msgstr ""
 "Contact\n"
 "Bannière"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Gras"
 
@@ -1327,11 +1311,11 @@ msgstr "Personnalisation des thèmes de Gajim"
 msgid "Gone"
 msgstr "Parti"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactif"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Italique"
 
@@ -1380,7 +1364,7 @@ msgstr "Changer le _Sujet..."
 msgid "Configure _Room..."
 msgstr "Configurer le _Salon..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Marque-pages"
 
@@ -1469,8 +1453,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenue dans le Gestionnaire d'Archives Gajim</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1502,7 +1487,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Rechercher dans la base de données"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Historique de conversation"
 
@@ -1526,11 +1511,10 @@ msgid "_Log conversation history"
 msgstr "_Historique de conversation"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "Enregistrer ce salon dans les marque-pages (Ctrl+B)"
+msgstr "Enregistrer ce salon dans les marque-pages"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
@@ -1557,8 +1541,8 @@ msgstr "Récemment :"
 msgid "Room:"
 msgstr "Salon de discussion :"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "Re_joindre"
 
@@ -1586,7 +1570,7 @@ msgstr "Minimiser automatiquement"
 msgid "Print status:"
 msgstr "Afficher l'état :"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Serveur :"
 
@@ -1615,14 +1599,14 @@ msgid "<b>Settings</b>"
 msgstr "<b>Paramètres</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
 msgstr ""
 "Connexion HTTP\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1633,32 +1617,28 @@ msgid "Pass_word:"
 msgstr "_Mot de passe : "
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Proxy :"
+msgstr "Hôte du proxy :"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Port :"
+msgstr "_Port du proxy :"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
-msgstr ""
+msgstr "Utiliser un prox_y HTTP"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Utiliser l'authentification"
+msgstr "Utiliser l'auth_entification"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
-msgstr ""
+msgstr "_BOSH URL :"
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Type : "
+msgstr "_Type : "
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
@@ -1701,17 +1681,26 @@ msgid "Show a list of formattings"
 msgstr "Afficher une liste de styles"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Affiche un menu de fonctions avancées (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Afficher le profil du contact (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr "Démarrer/arrêter une session audio"
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr "Démarrer/arrêter une session vidéo"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "En_voyer"
 
@@ -1810,7 +1799,7 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:26
 msgid "Allow sound when I'm _busy"
-msgstr ""
+msgstr "Autoriser les sons quand je suis _occupé(e)"
 
 #: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
@@ -1827,7 +1816,7 @@ msgstr ""
 "Détection automatique à chaque démarrage\n"
 "Toujours utiliser les applications par défaut de GNOME\n"
 "Toujours utiliser les applications par défaut de KDE\n"
-"Toujours utiliser les applications par défaut de XFCE4\n"
+"Toujours utiliser les applications par défaut de Xfce\n"
 "Personnalisé"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1843,6 +1832,14 @@ msgid "Configure color and font of the interface"
 msgstr "Paramétrer la couleur et la police de texte de l'interface"
 
 #: ../data/glade/preferences_window.glade.h:36
+msgid "Contact's message:"
+msgstr "Le message du contact :"
+
+#: ../data/glade/preferences_window.glade.h:37
+msgid "Contact's nickname:"
+msgstr "Le pseudo du contact :"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1856,31 +1853,31 @@ msgstr ""
 "Conversations par compte et Roster séparé\n"
 "Conversations par type et Roster séparé"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Afficher l'_activité des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Afficher des informations détaillées de courriels"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Afficher ce que mes contacts écoutent"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Afficher l'a_vatar des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Afficher l'humeur des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Afficher les _messages d'état des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1890,7 +1887,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quels états de conversation vous voulez envoyer à vos contacts."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1900,7 +1897,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1908,11 +1905,11 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est déconnecté"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Cacher tous les boutons dans les fenêtres de conversations"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1920,7 +1917,7 @@ msgstr ""
 "Si cette case est cochée, Gajim autorisera les autres à détecter le système "
 "d'exploitation que vous utilisez"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1928,14 +1925,14 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera également des informations à "
 "propos de l'expéditeur des nouveaux courriels"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Si cette case est cochée, Gajim changera votre statut en Absent(e) quand "
 "l'ordinateur est inutilisé."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1943,7 +1940,7 @@ msgstr ""
 "Si cette case est cochée, Gajim changera votre statut en Non disponible "
 "quand l'ordinateur n'a pas été utilisé pendant une plus longue période"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1951,7 +1948,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1959,28 +1956,28 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera l'activité des contacts dans votre "
 "liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera l'humeur de chaque contact dans "
 "votre roster"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera ce que chaque contact écoute dans "
 "votre roster"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1991,7 +1988,7 @@ msgstr ""
 "définie explicitement par clique droit sur le champ de saisie, la langue par "
 "défaut sera utilisée pour ce contact ou ce salon."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2001,7 +1998,7 @@ msgstr ""
 "contacts non autorisés. Utilisez avec précaution car cela bloque tous les "
 "messages provenant des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -2011,7 +2008,7 @@ msgstr ""
 "Veuillez noter qu'en utilisant une encryption E2E, l'utilisateur distant "
 "doit l'accepter, sinon les messages ne seront pas archivés."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2019,7 +2016,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera une notification quand un nouveau "
 "courriel GMail est reçu"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2029,7 +2026,7 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent(e), occupé(e), etc.)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2037,7 +2034,7 @@ msgstr ""
 "Si cette case est cochée, Gajim ne demandera pas de message de statut. Le "
 "message par défaut sera utilisé à la place."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2045,50 +2042,53 @@ msgstr ""
 "Si cette case n'est pas décochée, Gajim va remplacer les émoticônes ASCII "
 "comme « :) » par un équivalent graphique statique ou dynamique"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Archiver les conversations _chiffrées"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Rendre les fenêtres de conversation _compactes"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "_Gérer..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Jamais\n"
+"Seulement lorsqu'il y a des évènements en attente\n"
+"Toujours"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Me signaler les contacts qui se _connectent"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Me signaler les contacts qui se _déconnectent"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "M'avertir lors de l'arrivée d'un courrier électronique _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Événements Personnels"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "_Jouer les sons"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2098,24 +2098,23 @@ msgstr ""
 "Afficher une notification\n"
 "Afficher uniquement dans le Roster"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
-msgstr "L'afficher dans la zone de notifications"
+msgstr "Afficher l'icône de notifications :"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2123,145 +2122,147 @@ msgstr ""
 "Certains messages peuvent contenir du texte complexe (formatage, couleurs, "
 "etc.). Si activé, Gajim l'affichera seulement en tant que texte non formaté. "
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Trier les contacts par état"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "État"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "_Icônes d'état :"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Style"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "T_hème :"
 
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:95
 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 ""
-"Le message de statut d'auto-absence. S'il est vide, Gajim ne modifiera pas "
-"le message de statut actuel"
+"Le message de statut absent automatique. S'il est vide, Gajim ne changera "
+"pas le message de statut courant\n"
+"$S sera remplacé par l'ancien message de statut\n"
+"$T sera remplacé par le temps d'absence"
 
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:98
 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 ""
-"Le message de statut d'auto-idle. S'il est vide, Gajim ne modifiera pas le "
-"message de statut actuel"
+"Le message de statut non-disponible automatique. S'il est vide, Gajim ne "
+"changera pas le message de statut courant\n"
+"$S sera remplacé par l'ancien message de statut\n"
+"$T sera remplacé par le temps de non-activité"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Utiliser les icônes des passere_lles"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Utiliser la valeur par _défaut"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Quand un nouvel événement est reçu :"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+msgid "Your message:"
+msgstr "Votre message :"
+
+#: ../data/glade/preferences_window.glade.h:105
+msgid "Your nickname:"
+msgstr "Votre pseudo :"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "Passer _Absent(e) après :"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "_Afficher les notifications d'état :"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "É_moticônes :"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "Gestionnaire de _fichiers :"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorer le formatage complexe du texte dans les messages entrants"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "Message _entrant :"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "Inscrire dans l'_historique les changements d'état des contacts"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "Logiciel de courriel :"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "Passer _indisponible après :"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Message s_ortant :"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "Utilise_r les couleurs par défaut"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "_Envoyer les notifications d'état :"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "Message d'état :"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "Mise à valeur des _URL :"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "Comportement de la _fenêtre :"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "dans les _salons de discussion"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "dans le _roster"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutes"
 
@@ -2294,9 +2295,8 @@ msgid "All"
 msgstr "Tous"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "tous par état d'inscription"
+msgstr "Tout (y compris les abonnements)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2314,7 +2314,7 @@ msgstr "Identifiant Jabber :"
 msgid "Order:"
 msgstr "Ordre :"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Liste privée"
 
@@ -2458,7 +2458,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Préfixe :</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Rôle :</b>"
 
@@ -2518,8 +2518,8 @@ msgstr "Supprimer le compte de Gajim et du _serveur"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Supprimer"
 
@@ -2528,24 +2528,25 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>quelqu'un@quelquepart.com</b> aimerait que vous <b>ajoutiez</b> quelques "
+"contacts à votre roster."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Corps du Message <actuellement inutilisé, donc caché par défaut>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Échange d'item du roster"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-close"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2572,9 +2573,8 @@ msgid "Profile, A_vatar"
 msgstr "Profil et _avatar"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Afficher les Contacts _déconnectés"
+msgstr "Afficher seulement les contacts _Actifs"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2603,7 +2603,7 @@ msgstr "Act_ions"
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "É_dition"
 
@@ -2644,11 +2644,11 @@ msgid "_Add contact"
 msgstr "_Ajouter un contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Rechercher"
 
@@ -2668,10 +2668,6 @@ msgstr "S'enregistrer à"
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2778,9 +2774,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Client :</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>Région :</b>"
+msgstr "<b>Heure du contact :</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
@@ -2879,284 +2874,270 @@ msgstr "Ressource :"
 msgid "Status:"
 msgstr "État :"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Annuler la confirmation"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 "Vous êtes en train d'éxecuter une commande. Êtes vous sûr de vouloir "
 "l'annuler ?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Le service a envoyé des données mal-formées"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Le service a modifié l'identifiant de la session."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Le service a renvoyé une erreur."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Activé"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Désactivé"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Booléen"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Entier"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Couleur"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Option"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Valeur"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Aucune)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Éléments masqués"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Vous avez publié l'article :"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Vous avez reçu de nouvelles entrées (et %(count)d non-affichées) :"
+msgstr[1] "Vous avez reçu de nouvelles entrées (et %(count)d non-affichées) :"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Anglais"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Biélorusse"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Allemand"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Grec"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Anglais (Britannique)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Français"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Croate"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italien"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Portugais brésilien"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Russe"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Chinois"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Langue du correcteur orthographique"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Votre message ne peut être envoyé tant que vous n'êtes pas connecté."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 msgid "Underline"
 msgstr "Souligné"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 msgid "Strike"
 msgstr "Barré"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr "Police"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 msgid "Clear formating"
 msgstr "Style par défaut"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Êtes vous sûr de vouloir envoyer le fichier ?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Si vous envoyez un fichier à %s, il/elle connaîtra votre véritable "
 "identifiant Jabber."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "Chiffrement GPG activé"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "Une liste des transferts de fichier actifs, terminés et arrêtés"
+msgstr "Ce contact ne prend pas en charge les transferts de fichier."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
+"Vous avez besoin de connaître le vrai JID du contact pour lui envoyer un "
+"fichier."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Artiste Inconnu"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Titre Iconnu"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Source Inconnue"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-msgstr ""
-"<b>« %(title)s »</b> par <i>%(artist)s</i>\n"
-"de <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
+msgstr "État %(type)s : %(state)s, raison : %(reason)s"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s du salon de discussion %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Aucune clef GPG assignée"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3164,50 +3145,50 @@ msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages avec GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "Chiffrement GPG désactivé"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "La session SERA archivée"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "La session ne sera PAS archivée"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "est"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "N'est PAS"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "sera"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "NE sera PAS"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "et authentifiée"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
 msgstr "et NON authentifiée"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3216,23 +3197,23 @@ msgstr ""
 "Chiffrement %(type)s %(status)s actif %(authenticated)s.\n"
 "Votre discussion %(logged)s archivée."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Négociation annulée"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Cette session est chiffrée"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr " et SERA archivée"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr " et NE SERA PAS archivée"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3240,25 +3221,25 @@ msgstr ""
 "Identité du contact non vérifiée. Cliquez sur le bouton bouclier pour plus "
 "de détails."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "Chiffrement E2E désactivé"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Le message suivant n'a PAS été chiffré"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Le message suivant n'a été chiffré"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vous venez de recevoir un nouveau message de \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3266,15 +3247,15 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3283,7 +3264,7 @@ msgstr ""
 "Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer ou "
 "supprimez le (toutes les archives seront perdues)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s est maintenant %(status)s"
@@ -3292,23 +3273,23 @@ msgstr "%(name)s est maintenant %(status)s"
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s est un fichier mais devrait être un répertoire"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s est un répertoire mais devrait être un fichier"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "crée le répertoire %s"
@@ -3371,10 +3352,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Choisissez les groupes de discussion que vous voulez quitter"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Salons de discussion"
 
@@ -3392,7 +3373,7 @@ msgstr "Tous les messages non-lus ont été transmis."
 
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Jouer les sons quand vous êtes occupé(e)"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3401,6 +3382,8 @@ msgstr "Utiliser DBus et Notification-Daemon pour afficher les notifications"
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
+"Afficher uniquement les contacts « disponible » et « Disponible pour discuter "
+"» dans le roster."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3431,51 +3414,49 @@ msgstr ""
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
+"Quand afficher l'icône dans la zone de notifications. Peut être « never "
+"» (jamais), « on_event » (lorsqu'il y a un évènement en attente) ou « always "
+"» (toujours)"
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Nom d'utilisateur invalide"
+msgstr "Couleur des pseudos entrants"
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Couleur du pseudo sortant."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Couleur du texte entrant."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Couleur du texte sortant."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "texte du message d'état :"
+msgstr "Colour des messages de statut"
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Nom d'utilisateur invalide"
+msgstr "Police des pseudos entrants."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Changement de Surnom"
+msgstr "Police des pseudos sortants."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Police du texte entrant."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Police du texte sortant."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "texte du message d'état :"
+msgstr "Police du message de statut"
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3485,9 +3466,9 @@ msgstr ""
 "repliés."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "Par défaut"
 
@@ -3595,16 +3576,22 @@ msgstr ""
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
 msgstr ""
+"Le nombre de lignes d'archives qui seront demandées en entrant dans un salon."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr ""
+"Le nombre de minutes d'archives qui seront demandées en entrant dans un "
+"salon."
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Le nombre de secondes à attendre avant de tenter de se reconnecter "
+"automatiquement à un salon dont vous avez été déconnecté. Mettre à 0 pour "
+"désactiver."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3694,6 +3681,9 @@ 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 ""
+"Demander avant de fermer une fenêtre contenant des onglets si des données "
+"peuvent être perdues (conversations, conversations privées, salons qui se "
+"seront pas minimisés)"
 
 #: ../src/common/config.py:192
 msgid ""
@@ -3951,23 +3941,20 @@ msgstr ""
 "affiché."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Doit-on afficher le dialogue de confirmation de la création de "
-"métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
-"affiché."
+"Doit-on afficher le dialogue de confirmation de bloquage d'un contact ? Une "
+"valeur vide fera en sorte que le dialogue ne soit jamais affiché."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Doit-on afficher le dialogue de confirmation de la création de "
-"métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
+"Doit-on afficher le dialogue de confirmation de l'envoi de statut "
+"personnalisé ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
 "affiché."
 
 #: ../src/common/config.py:259
@@ -3990,13 +3977,12 @@ msgstr ""
 "les mots de passe des comptes."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Si vrai, Gajim va utiliser Gnome Keyring (s'il est disponible) pour stocker "
-"les mots de passe des comptes."
+"Si vrai, Gajim va utiliser KDE Wallet (si kwalletcli est disponible) pour "
+"stocker les mots de passe des comptes."
 
 #: ../src/common/config.py:262
 msgid ""
@@ -4067,29 +4053,35 @@ msgstr ""
 "la valeur est grande, plus la taille l'est."
 
 #: ../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)"
 msgstr ""
 "Schémas d'uri valides. Seuls les schémas dans cette liste seront acceptés "
-"comment « vraies » uri."
+"comment « vraies » uri. (mailto et xmpp sont gérés séparément)"
 
 #: ../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 ""
+"Demander le message de statut à tous les contacts hors-ligne lorsque la "
+"connexion à un compte est établie. ATTENTION : cela provoque l'envoie de "
+"nombreuses requêtes !"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Si Vrai, la complétion dans les salons sera similaire à celle d'un shell"
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"Quand doit-on s'afficher dans notre propre roster ? Peut être « always "
+"» (toujours), « when_other_resource » (quand d'autres ressources sont "
+"connectées) ou « never » (jamais)"
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4117,13 +4109,14 @@ msgstr "Si activé, restaure le dernier statut qui était utilisé."
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
+"Si Vrai, les demandes d'autorisation de contact seront automatiquement "
+"acceptées."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
-"Si Faux, vous ne verrez plus les avatars dans les fenêtres de conversation."
+"Si Faux, ce compte sera désactivé et n'apparaîtra plus dans votre roster."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4169,14 +4162,13 @@ msgstr "Liste d'erreurs ssl, séparées par une virgule, à ignorer."
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Espace envoyée après inactivité"
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "ping XMPP envoyé après inactivité"
 
 #: ../src/common/config.py:323
-#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4189,7 +4181,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Contournement de bug de jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4197,15 +4189,15 @@ msgstr ""
 "Si cette case est cochée, Gajim utilisera votre IP et les proxies définis "
 "dans l'option file_transfer_proxies pour les transferts de fichiers."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Répondre aux demandes d'accusés de réception"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Envoyer des demandes d'accusés de réception"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4213,11 +4205,11 @@ msgstr ""
 "Durant la négociation d'une session chiffrée, Gajim doit-il partir du "
 "principe que vous voulez archiver vos conversations ?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Est-ce que OpenPGP est activé pour ce contact ?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4225,101 +4217,101 @@ msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée avec ce "
 "contact quand cela est possible ?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Langue dans laquelle faire la vérification orthographique"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "tous ou par état (séparé par des espaces)"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ou 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ou ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dort"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Travaille"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Je suis sorti profiter de la vie."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Disponible"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Ne pas déranger."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Au revoir !"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4327,101 +4319,100 @@ msgstr ""
 "Son à jouer lorsqu'un message de salon contient un des mots de "
 "muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son émis lors de l'arrivée d'un message de salon de discussion."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "vert"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Impossible de charger le module d'inactivité"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Hôte erroné"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Adresse locale invalide ? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
-msgstr "S'enregistrer à %s"
+msgstr "L'inscription a réussi"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Enregistrement avec l'agent %s réussi"
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
-msgstr "La connexion a échoué"
+msgstr "L'inscription a échoué"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
+"L'enregistrement avec l'agent %(agent)s a échoué avec l'erreur %(error)s : %"
+"(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Erreur d'Écriture du disque"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Invisibilité non-supportée"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Le compte %s ne supporte pas l'invisibilité."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
+msgstr "Un message d'un JID invalide a été reçu, il a été ignoré."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4431,7 +4422,7 @@ msgstr ""
 "(voir http://trac.gajim.org/wiki/DatabaseBackup) ou supprimez le (toutes les "
 "archives seront perdues)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Surnom invalide : %s"
@@ -4439,76 +4430,76 @@ msgstr "Surnom invalide : %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Le nombre maximal d'utilisateurs pour %s a été atteint"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Vous êtes banni du salon %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Le salon %s n'existe pas."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Votre pseudonyme enregistré doit être utilisé dans le salon %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres du salon %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Le salon de discussion a été détruit"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Vous pouvez rejoindre le salon %s à la place"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4646,82 +4637,112 @@ msgstr "L'utilisation de la clé n'inclut pas la signature d'un certificat"
 msgid "Application verification failure"
 msgstr "Echec de la vérification de l'application"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr ""
+"Il n'est pas possible d'envoyer un message à %s, ce JID n'est pas valide."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Le présence distante n'est pas signée et aucune clef n'a été assignée."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+"La clef du contact (%s) ne correspond pas à la clef assignée dans Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Ce message est *chiffré* (Voir : XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Sujet : %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Reconnecter manuellement."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Le serveur %(name)s a mal répondu à la requête d'enregistrement : %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Le serveur %s a fourni une forme d'inscription différente"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erreur SSL inconnue : %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Réponse non valide"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "La passerelle %(name)s a mal répondu à la requête d'enregistrement : %(error)"
 "s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Enregistré dans : %s"
+msgstr "le serveur a répondu : %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "La connexion au proxy a échoué"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossible de se connecter au compte %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "La connexion avec le compte %s a été perdue. Essayez de vous connecter à "
 "nouveau."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "L'authentification du certificat %s peut être invalide."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4730,7 +4751,7 @@ msgstr ""
 "\n"
 "Erreur SSL : <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4739,24 +4760,24 @@ msgstr ""
 "\n"
 "Erreur SSL inconnue : %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Une erreur s'est produite pendant la suppression de la liste privée"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4765,77 +4786,43 @@ msgstr ""
 "La liste privée %s n'a pas été supprimée. Elle est peut-être active dans une "
 "des ressources connectées. Désactivez la et réessayez."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Il n'est pas possible d'envoyer un fichier vide"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Le présence distante n'est pas signée et aucune clef n'a été assignée."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-"La clef du contact (%s) ne correspond pas à la clef assignée dans Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Ce message est *chiffré* (Voir : XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Sujet : %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Contact envoyé : « %s » (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Inviter des _Contacts"
+msgstr "Contacts envoyés :"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Non récupéré à cause du statut invisible"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "La connexion a échoué"
+msgstr "La désinscription a échoué"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+msgstr "Le désabonnement du server %(server)s a échoué : %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Observateurs"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Passerelles"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Pas dans la liste"
 
@@ -4852,7 +4839,7 @@ msgstr "Les possibilités D-Bus de Gajim ne peuvent pas être utilisées"
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus n'est pas correctement lancé sur cette machine"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -5082,7 +5069,7 @@ msgstr "Disponible pour discuter"
 msgid "_Available"
 msgstr "_Disponible"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Disponible"
 
@@ -5200,77 +5187,77 @@ msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gio"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mio"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s Kio"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message en attente"
 msgstr[1] "%d messages en attente"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " du salon %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr "de l'utilisateur %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr "de %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d évènement en attente"
 msgstr[1] "%d événements en attente"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5286,652 +5273,673 @@ msgid "%s is not a valid loglevel"
 msgstr "%s n'est pas un loglevel valide"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "migration de la base de données de l'historique vers des index"
 
 #: ../src/common/passwords.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "du compte %s"
+msgstr "Compte XMPP %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Effrayé(e)"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Épaté(e)"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Amoureux(se)"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "En colère"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Ennuyé(e)"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Anxieux(se)"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Excité(e)"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Honteux(se)"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Ennuyé(e)"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Courageux(se)"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Calme"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Prudent(e)"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Froid(e)"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Confiant(e)"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Confus(e)"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Contemplatif(ve)"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Satisfait(e)"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Grincheux(se)"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Cinglé(e)"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Créatif(ve)"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Curieux(se)"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Découragé(e)"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Déprimé(e)"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Déçu(e)"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Écœuré(e)"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Estomaqué(e)"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Distrait(e)"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Embarrassé(e)"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Envieux(se)"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Excité(e)"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Dragueur(se)"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustré(e)"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Reconnaissant(e)"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "En deuil"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Grognon(ne)"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Coupable"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Heureux(se)"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "optimiste"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Bouillant(e)"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Humble"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Humilié(e)"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Affamé(e)"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Blessé(e)"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Impressionné(e)"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Craintif(ve)"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Amoureux(se)"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Indigné(e)"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Intéressé(e)"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Intoxiqué(e)"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Jaloux(se)"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Solitaire"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Perdu(e)"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Chanceux(se)"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Méchant(e)"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Morose"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nerveux(se)"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutre"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Outré(e)"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Scandalisé(e)"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Enjoué(e)"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Fier(e)"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Détendu(e)"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Soulagé(e)"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Plein(e) de remords"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Impatient(e)"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarcastique"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Satisfait(e)"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Concentré(e)"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Choqué(e)"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Timide"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Malade"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Endormi(e)"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontané(e)"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Stressé(e)"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Fort(e)"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Surpris(e)"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Reconnaissant(e)"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Assoiffé(e)"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Fatigué(e)"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Indéfini"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Faible"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Inquiet(e)"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Fait des corvées"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Achète des provisions"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Fait le ménage"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Cuisine"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Fait de la maintenance"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Fait la vaisselle"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Lave le linge"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Jardine"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Fait une course"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Promène le chien"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Boit"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Prend une bière"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Prend un café"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Prend un thé"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Prend un snack"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Prend le petit-déjeuner"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Soupe"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Dîne"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Fait de l'exercice"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Fait du vélo"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Danse"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Fait de la randonnée"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Fait un jogging"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Fait du sport"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Court"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Skie"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Nage"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "S'entraine"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Se toilette"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "À la station thermale"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Se brosse les dents"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Se fait couper les cheveux"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Se rase"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Prend un bain"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Prend une douche"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "A un rendez-vous"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "En congé"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Traîne"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Se cache"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Fait une prière"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "En vacances organisées"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Réfléchit"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Se relaxe"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Pêche"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Joue"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Sort"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Fait la fête"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Lit"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Se prépare"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Fait les magasins"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Fume"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Se socialise"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Prend un bain de soleil"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Regarde la télé"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Regarde un film"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Discute"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "Dans la vraie vie"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Au téléphone"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "En visioconférence"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Voyage"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Fait la navette"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Conduit"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "En voiture"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "En bus"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "En avion"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "En train"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "En séjour"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Marche"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Code"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "En réunion"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Étudie"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Écrit"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Artiste Inconnu"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Titre Iconnu"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Source Inconnue"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>« %(title)s »</b> par <i>%(artist)s</i>\n"
+"de <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5955,38 +5963,11 @@ msgstr ""
 "[Ceci fait partie d'une session chiffrée. Si vous voyez ce message, un "
 "problème a eu lieu.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"L'hôte %s que vous avez spécifié dans l'option avancée "
-"« ft_add_hosts_to_send » est invalide, il a été ignoré."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Mot de passe OpenPGP non renseigné"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Vous serez connecté à %s sans OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Pour continuer à envoyer et recevoir des messages, vous devez vous "
-"reconnecter."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Erreur d'Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5995,53 +5976,44 @@ msgstr ""
 "%s\n"
 "La messagerie en « link-local » pourrait ne pas fonctionner correctement."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Veuillez vérifier si Avahi ou Bonjour sont installés."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Impossible de lancer le service local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de débloquer le port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Vérifiez si avahi-daemon est actif."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossible de changer l'état du compte « %s »"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Vous n'êtes pas connecté ou vous êtes invisible. Votre message n'a pas pu "
-"être envoyé."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Ce message est chiffré]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Votre message n'a pas pu être envoyé."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Le destinataire est déconnecté. Votre message n'a pas pu être envoyé."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6054,24 +6026,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erreur en ajoutant le service. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Message par défaut"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Le dictionnaire pour la langue %s est indisponible"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6080,219 +6052,215 @@ msgstr ""
 "Vous devez installer le dictionnaire %s pour la vérification orthographique, "
 "ou choisir un autre langage en paramétrant l'option speller_language."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "texte du message d'état :"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si vous voulez que vos changements soit appliqués immédiatement, vous devez "
 "vous reconnecter."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Événements non lus"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les événements avant de supprimer ce compte."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vous avez une conversation ouverte dans le compte %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Toutes les fenêtres de conversation et de salons de discussion seront "
 "fermées. Voulez-vous continuer ?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Pour changer le nom du compte, vous devez être déconnecté."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "Pour changer le nom du compte, vous devez lire tous ses événements."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ce nom est déjà utilisé par un autre de vos comptes. Choisissez un autre nom."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Renommer le compte"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entrez un nouveau nom pour le compte %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un Identifiant Jabber doit être de la forme \"user@servername\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr ""
-"Il y a eu un problème durant la récupération de vos clés OpenPGP secrètes."
+msgstr "Aucune clef OpenPGP disponible."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Vous devez d'abord créer votre compte avant d'éditer vos informations."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Votre serveur ne supporte pas les Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "Pour changer le nom du compte, vous devez être déconnecté."
+msgstr "Afin de désactiver un compte vous devez être déconnecté."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Ce compte existe déjà localement."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Veuillez le renommer et l'enlever avant d'activer la messagerie link-local."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Liste des bannis"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Liste des membres"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Liste des propriétaires"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Liste des administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "Identifiant Jabber"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6300,11 +6268,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6312,11 +6280,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6324,11 +6292,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un possesseur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6336,8 +6304,7 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6354,88 +6321,86 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Tout"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Entrées et sorties seulement"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "Aucun"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Créer un salon de discussion"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Surnom invalide : %s"
+msgstr "Caractère non-autorisé"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Serveur invalide"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Entrée invalide"
+msgstr "Salon invalide"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6445,32 +6410,32 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Vous devez entrer un nom d'utilisateur pour configurer ce compte."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Saisissez un serveur sur lequel vous voulez vous enregistrer."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Certificat déjà dans un Fichier"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ce certificat est déjà dans le fichier %s, il n'a donc pas été ajouté."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6485,7 +6450,7 @@ msgstr ""
 "Erreur SSL  %(error)s\n"
 "Voulez vous toujours vous connecter au serveur ?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6496,63 +6461,63 @@ msgstr ""
 "Empreinte digitale SHA1 du certificat :\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Premier message reçu"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Message Reçu Suivant Avec le Focus."
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Message Reçu Suivant Sans le Focus"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Contact connecté"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Contact déconnecté"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Message envoyé"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un salon mis en surbrillance"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Courriel Gmail reçu"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6562,7 +6527,7 @@ msgstr ""
 "été reçu par le contact distant. Si cette icône reste\n"
 "pendant un long moment, le message a probablement été perdu."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6570,229 +6535,225 @@ msgstr ""
 "Le texte sous cette règle correspond à ce qui a été dit depuis\n"
 "la dernière fois que vous avez consulté ce salon de discussion"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Quitter"
+msgstr "_Citation"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Il manque un \"%s\" dans l'URL de recherche sur Internet"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Ouvrir en tant que _lien"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Hier"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "Il y a %i jours"
+msgid_plural "%i days ago"
+msgstr[0] "Hier"
+msgstr[1] "Hier"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Identifiant Jabber déjà existant"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "L'identifiant Jabber que vous avez entré est déjà dans la liste. Veuillez en "
 "choisir un autre."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "nouveau@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nouveau%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nom du contact : <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Identifiant Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Définir l'Humeur"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Message d'état"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Remplacer le message de statut ?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ce nom est déjà utilisé. Voulez vous remplacer ce message de statut ?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Enregistrer comme messages d'état prédéfini"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Tapez un nom pour ce message d'état"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Adresse AIM :"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Numéro GG :"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Numéro ICQ :"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Adresse MSN :"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Adresse Yahoo! :"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Remplissez les informations sur le contact à ajouter au compte %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Vous ne pouvez pas vous ajouter à votre propre roster."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Version de GTK+ :"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Version de PyGTK :"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Développeurs actuels :"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "MERCI :"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Pour finir, nous voulons remercier tous les mainteneurs de paquet."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Yann Le Boulanger <asterix@lagaule.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>\n"
 "Florent Le Coz <louizatakk@fedoraproject.org>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6805,103 +6766,106 @@ msgstr ""
 "\n"
 "Le soulignement des fautes d'orthographe ne sera pas utilisé"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Le pseudonyme contient des caractères non autorisés."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Requête d'inscription pour le compte %(account)s de la part de %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas "
 "connecté."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Nom de compte invalide"
+msgstr "Compte invalide"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Le compte avec lequel vous voulez entrer dans le salon"
+msgstr ""
+"Vous devez choisir un compte depuis lequel vous souhaitez rejoindre le salon "
+"de discussion."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Identifiant Jabber de salon invalide"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Veuillez entrer l'identifiant Jabber du salon, comme salon@serveur"
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "L'identifiant jabber du salon de discussion contient des caractères "
 "interdits."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Ceci n'est pas une conversation multi-utilisateurs"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s n'est pas un nom de salon de discussion valide"
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Ce compte est connecté au serveur"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Vous ne pouvez pas vous synchroniser avec un compte sauf s'il est connecté."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6910,300 +6874,327 @@ msgstr ""
 "envoyer un message :"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossible d'interpréter \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nouveau message"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Nouveau courrier électronique"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de fichier"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple dans le compte %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "Console XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Triste"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Modifier"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "Suppri_mer"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%s</b> aimerait que vous <b>%s</b> quelques contacts dans votre roster."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
-msgstr ""
+msgstr "Ajouter"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Morose"
+msgstr "Modifier"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Identifiant Jabber :"
+msgstr "Identifiant Jabber"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Groupe"
+msgstr "Groupes"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
+msgstr "%s m'a conseillé de vous ajouter à mes contacts."
+
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Ajouter un contact"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Enlever le contact de la liste"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste privée <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste privée pour %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ordre : %(order)s, action : %(action)s, type : %(type)s, valeur : %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordre : %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifier une règle</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ajouter une règle</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listes privées pour %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Nom de liste invalide"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Vous devez entrer un nom pour créer une liste privée."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes invité(e) dans un groupe de discussion"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vous a invité dans un salon de discussion"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact vous a invité dans le salon de discussion %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Voulez-vous accepter l'invitation ?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "quand je suis "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7214,19 +7205,19 @@ msgstr ""
 "\n"
 "La Short Authentication String cette session est <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Vous avez déjà vérifié l'identité de ce contact."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Identité du contact vérifiée"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Vérifier à nouveau..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7236,19 +7227,19 @@ msgstr ""
 "messages et vous en envoyer, vous devez vérifier son identité en cliquant "
 "sur le bouton en-dessous."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Identité du contact NON vérifiée"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Vérifier..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Avez-vous vérifié l'identité du contact ?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7263,24 +7254,24 @@ msgstr ""
 "\n"
 "La Short Authentication String de cette session est : <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Avec vous parlé au contact et vérifié la SAS ?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "La clef du contact (%s) <b>ne correspond pas</b> à la clef assignée dans "
 "Gajim."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7289,7 +7280,7 @@ msgstr ""
 "sa clef</b>, les messages <b>ne peuvent</b> donc <b>pas</b> être chiffrés. "
 "Utilisez votre client GPG pour avoir confiance en cette clef."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7297,6 +7288,27 @@ msgstr ""
 "Une clef GPG est assignée à ce contact, et vous avez confiance en sa clef, "
 "les messages seront donc chiffrés."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr "audio et vidéo"
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr "audio"
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr "vidéo"
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+"%(contact)s veut démarrer un session %(type)s avec vous. Voulez-vous "
+"répondre à son appel ?"
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Autres"
@@ -7306,24 +7318,24 @@ msgstr "Autres"
 msgid "Conference"
 msgstr "Conférences"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services du compte %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7331,250 +7343,241 @@ msgstr ""
 "Il n'y a aucun service à l'adresse indiquée, ou bien il ne répond pas. "
 "Veuillez vérifier l'adresse et réessayer."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Ce type de service ne contient pas d'élément à parcourir."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Nom de serveur invalide"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Parcourt %(address)s en utilisant le compte %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Exécuter une commande"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanne %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Utilisateurs"
 
 # ccount). Description column
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
 "contacts."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Inscrit"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Nœud"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Nouvel article"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Désinscrire"
 
-#: ../src/features_window.py:46
-#, fuzzy
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
-msgstr "Erreur de certificat SSL"
+msgstr "Validation de certificat SSL"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Une librairie utilisée pour valider les certificats des serveurs afin "
 "d'assurer une connexion sécurisée."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Nécessite python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Conversation sans serveur avec détection automatique des clients dans un "
 "réseau local."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Nécessite python-avahi"
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Nécessite pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Commandes : %s"
+msgstr "Ligne de commandes"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Un script permettant de contrôler Gajim avec des lignes de commande."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Nécessite python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Fonctionnalité indisponible sous Windows."
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "Bascule le chiffrement _GPG"
+msgstr "Chiffrement OpenGPG"
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
-msgstr "Chiffrement des messages à l'aide de clefs GPG."
+msgstr "Chiffrement des messages avec des clefs GPG."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Nécessite gpg et python-GnuPGInterface."
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Auto-détection du statut de la connexion."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Nécessite gnome-network-manager et python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Gestion de la Session"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "La session Gajim est enregistrée à la déconnexion et restaurée à la "
 "connexion."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Nécessite python-gnome2"
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Mot de passe pour entrer dans le salon"
+msgstr "Chiffrement du mot de passe"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Les mots de passe peuvent être stockés de façon sécurisée et non pas "
 "seulement en texte."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Nécessite gnome-keyring et python-gnome2-desktop."
+msgstr "Nécessite gnome-keyring et python-gnome2-desktop, ou kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 "Possibilité de se connecter à des serveurs qui utilisent des entrées SRV."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Nécessite dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Nécessite nslookup afin d'utiliser les enregistrements SRV."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Vérificateur d'Orthographe"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Vérification ortohgraphique des messages composés."
 
-#: ../src/features_window.py:80
-#, fuzzy
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
-msgstr "Nécessite python-dbus."
+msgstr "Nécessite libgtkspell"
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
-msgstr "Notifications"
+msgstr "Notification"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Notification de nouveaux événements via des popups."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7582,55 +7585,33 @@ msgstr ""
 "Nécessite python-notify ou python-dbus en conjonction avec notification-"
 "daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Trayicon"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Une icône dans le tray indiquant la présence courante."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Nécessite python-gnome2-extras ou une compilation du module trayicon depuis "
-"les sources Gajim."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Nécessite PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
-msgstr "_Ajuster selon l'état"
+msgstr "Statut automatique"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Possibilité de mesurer le temps d'inactivité, afin de définir un statut "
 "automatique."
 
-#: ../src/features_window.py:92
-#, fuzzy
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
-msgstr "Nécessite python-dbus."
+msgstr "Nécessite la librairie libxss."
 
-#: ../src/features_window.py:93
-#, fuzzy
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
-msgstr "Nécessite python-gnome2"
+msgstr "Nécessite python2.5"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transforme les expressions LaTeX entre $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7638,7 +7619,7 @@ msgstr ""
 "Nécessite texlive-latex-base et dvipng. Vous devez définir « use_latex » à "
 "True dans l'éditeur de configuration avancée."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7646,25 +7627,23 @@ msgstr ""
 "Nécessite texlive-latex-base et dvipng (tout est dans MikTeX). Vous devez "
 "définir « use_latex » à True dans l'éditeur de configuration avancée."
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "Chiffrement de bout en bout"
+msgstr "Chiffrement des messages de bout en bout"
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
-msgstr "Chiffrement de la conversation."
+msgstr "Chiffrement des messages de la conversation."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Nécessite python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "Générateur RST"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7672,24 +7651,36 @@ msgstr ""
 "Génère une sortie XHTML à partir d'un code RST (voir  http://docutils."
 "sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Nécessite python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Bannières et liens cliquables"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Possibilité d'avoir des URL cliquables dans les bannières des conversations."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Nécessite python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr "Audio / Vidéo"
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr "Possibilité de démarrer une conversation audio et vidéo."
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr "Nécessite python-farsight."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Fonctionnalité"
 
@@ -7705,107 +7696,106 @@ msgstr "Durée"
 msgid "Progress"
 msgstr "Progression"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Taille : %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Vous"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Destinataire : "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enregistré dans : %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinataire : %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Message d'erreur : %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Choisissez un fichier à envoyer..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Description :"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne peut accéder à ce fichier"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Ce fichier est utilisé par un autre processus."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Impossible de remplacer le fichier existant \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7813,33 +7803,33 @@ msgstr ""
 "Un fichier du même nom existe déjà et vous n'avez pas la permission de "
 "l'écraser."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Que voulez vous faire ?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Le dossier \"%s\" n'est pas accessible en écriture"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Vous n'avez pas les permissions de créer des fichiers dans ce dossier."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Enregistrer le Fichier sous..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7847,32 +7837,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Fichier non valide"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Fichier : "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pause"
 
@@ -7883,27 +7873,24 @@ msgstr "Gajim a besoin d'un serveur X pour démarrer. Fermeture..."
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "l'import de PyGTK a échoué : %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
+msgstr "Gajim a besoin de PyGTK 2.12 pour s'exécuter"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim a besoin de PyGTK 2.8 ou supérieur pour s'exécuter. Fermeture..."
+msgstr ""
+"Gajim a besoin de PyGTK 2.1é ou supérieur pour s'exécuter. Fermeture..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim a besoin de GTK 2.8 ou supérieur"
+msgstr "Gajim a besoin de GTK 2.12 ou supérieur"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim a besoin de GTK 2.8 ou supérieur pour s'exécuter. Fermeture..."
+msgstr "Gajim a besoin de GTK 2.12 ou supérieur pour s'exécuter. Fermeture..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7941,11 +7928,11 @@ msgid ""
 msgstr "Assurez-vous que Pywin32 est installé. Vous pouvez l'obtenir ici : %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim est déjà en cours d'exécution"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7953,473 +7940,28 @@ msgstr ""
 "Gajim semble déjà être en cours d'exécution\n"
 "Démarrer quand même ?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Mot de Passe Requis"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr ""
-"Entrez votre mot de passe GPG pour la clé %(keyid)s (compte %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Aucune clef GPG assignée"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Vous serez connecté à %s sans OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Mot de passe erroné"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Le surnom que vous vouliez utiliser dans le salon %s est actuellement "
-"utilisé ou enregistré par un autre occupant.\n"
-"Veuillez entrer un autre surnom ci-dessous :"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Acceptez vous sa requête ?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Acceptez vous cette requête sur le compte %s ?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Autorisation HTTP (%(method)s) pour %(url)s (id : %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "La connexion a échoué"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Erreur %(code)s : %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "erreur en envoyant %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Requête d'Inscription"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorisation acceptée"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Le contact \"%s\" vous a autorisé à voir son état."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Vous le/la verrez toujours hors-ligne.\n"
-"Voulez vous le/la supprimer de votre liste de contacts ?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Désinscrire"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Le contact avec \"%s\" ne peut être établi"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s est maintenant connu en tant que %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s est maintenant %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s a changé le sujet en %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-"N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Le salon affiche dorénavant les membres non-disponibles"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "Le salon n'affiche plus les membres non-disponibles"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"Un changement de la configuration du salon relatif à la vie-privée a eu lieu"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "L'enregistrement des conversations du salon est maintenant activé"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Le salon n'est plus anonyme"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Le salon est maintenant sami-anonyme"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Le salon est maintenant totalement anonyme"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Vous avez configuré Gajim pour qu'il utilise un agent GPG, mais aucun agent "
-"GPG n'est lancé ou il a renvoyé un mauvais mot de passe.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Votre mot de passe est incorrect"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Votre mot de passe est incorrect"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG n'est pas utilisable"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
-"chiffrer les messages."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Ne plus me poser la question"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring est installé mais pas \t\t\t\t\t\t\tcorrectement démarré "
-"(variable d'environnement probablement \t\t\t\t\t\t\tmal configurée)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nouveau courriel sur %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Vous avez %d nouveau courrier électronique"
-msgstr[1] "Vous avez %d nouveaux courriers électroniques"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"De : %(from_address)s\n"
-"Sujet : %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s souhaite vous envoyer un fichier."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Enlever le contact de la liste"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Erreur de lecture du fichier :"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr ""
-"Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Impossible de déchiffrer le message de %s\n"
-"Il a peut-être été manipulé."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Impossible de déchiffrer le message"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Conflit de nom d'utilisateur"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping ?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong ! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Erreur."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Conflit de ressource"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en "
-"entrer une nouvelle"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Erreur durant la vérification du certificat SSL"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Une erreur est survenue lors de la vérification du certificat SSL de votre "
-"serveur Jabber : %(error)s\n"
-"Voulez-vous toujours vous connecter à ce serveur ?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignorer cette erreur pour ce certificat."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Erreur de certificat SSL"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Le certificat SSL semble avoir changé, ou votre connexion est en train "
-"d'être hackée.\n"
-"Ancienne empreinte digitale : %(old)s\n"
-"Nouvelle empreinte digitale : %(new)s\n"
-"\n"
-"Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
-"certificat ?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Connexion non-sécurisée"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
-"chiffrée. Êtes vous sûr de vouloir le faire ?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
-"sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
-"sûr de vouloir le faire ?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "Le nœud PEP n'a pas été supprimé"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Émoticônes désactivées"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc "
-"désactivées."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Votre thème d'émoticônes n'a pu être chargé. Vous avez peut-être besoin de "
-"mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/"
-"wiki/Emoticons pour plus de détails."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr ""
-"Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
-"invisible."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Impossible d'enregistrer vos informations de configuration"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Afficher l'aide pour une commande"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "commande"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "montrer l'aide sur la commande"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Montre ou cache la fenêtre principale"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8427,49 +7969,49 @@ msgstr ""
 "Affiche une liste de tous les contacts de la liste. Chaque contact apparaît "
 "sur une ligne séparée"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "compte"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "montrer seulement les contacts du compte spécifié"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Affiche la liste des comptes enregistrés"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Change l'état du ou des compte(s)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "état"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "message"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "Message d'état"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8478,50 +8020,46 @@ msgstr ""
 "changer l'état de tous les compte qui ont l'option \"synchroniser avec "
 "l'état global\" activée"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Change l'état du ou des compte(s)"
+msgstr "Change la priorité du ou des compte(s)"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Priori_té :"
+msgstr "Priorité :"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Je veux _créer un nouveau compte"
+msgstr "priorité que vous voulez donner au compte"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"Change l'état du compte \"compte\". Si aucun n'est spécifié, essaye de "
-"changer l'état de tous les compte qui ont l'option \"synchroniser avec "
-"l'état global\" activée"
+"Change la priorité du compte spécifié. Si aucun compte n'est spécifié, "
+"change la priorité de tous les comptes qui ont l'option « synchroniser avec "
+"l'état global » activée"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Montre la fenêtre de discussion pour que vous puissiez envoyer un message à "
 "un contact"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "L'identifiant Jabber du contact avec lequel vous voulez discuter"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "contenu du message. Le compte doit être spécifié ou \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8531,29 +8069,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez seulement renseigner le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "L'identifiant Jabber du contact qui recevra le message"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "contenu du message"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "clé pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Si spécifié, le message sera chiffré en utilisant cette clé publique"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8563,135 +8101,135 @@ msgstr ""
 "et le compte sont facultatifs. Si vous voulez seulement renseigner le "
 "paramètre 'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "sujet"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "sujet du message"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Envoie un nouveau message à un salon que vous avez rejoint."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "L'identifiant Jabber du salon qui recevra le message"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "L'identifiant Jabber du contact"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Récupère les informations détaillées d'un compte"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nom du compte"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fichier"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Liste toutes les préférences et leurs valeurs"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'clé' est le nom de la préférence, 'valeur' est la valeur à assigner"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Supprime une option de préférence"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "touche"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nom de la préférence a supprimer"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Écrit les préférences actuelles de Gajim dans le fichier .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Ajouter le contact à la liste"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "identifiant Jabber"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Ajoute un nouveau contact à ce compte"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Renvoie le message d'état actuel (global à moins qu'un compte ne soit "
 "spécifié)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Renvoie le nombre de messages non-lus"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ouvre la fenêtre « Commencer une discussion »"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Commencer une discussion en utilisant ce compte"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Envoyer du XML personnalisé"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML à envoyer"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8699,72 +8237,71 @@ msgstr ""
 "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
 "à tous les comptes"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Gère une URI du type xmpp:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI à gérer"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Compte avec lequel vous voulez le gérer"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "contenu du message"
+msgstr "Contenu du message"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Joindre un groupe de discussions"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "groupe de discussion"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "JID du salon"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "pseudonyme"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Surnom à utiliser"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "mot de passe"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Mot de passe pour entrer dans le salon"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Le compte avec lequel vous voulez entrer dans le salon"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Vérifie si Gajim est lancé"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Montre ou cache la fenêtre ipython"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8773,17 +8310,17 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Il semble que Gajim ne soit pas lancé. Vous ne pouvez donc pas utiliser "
 "gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8792,16 +8329,16 @@ msgstr ""
 "Utilisation : %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8810,7 +8347,7 @@ msgstr ""
 "Utilisation : %s commande [arguments]\n"
 "commande est l'une de :\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8819,7 +8356,7 @@ msgstr ""
 "Trop d'arguments.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8828,7 +8365,7 @@ msgstr ""
 "L'argument \"%(arg)s\" n'est pas précisé.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Mauvaise adresse (URI)"
 
@@ -8858,150 +8395,175 @@ msgid "Please first choose another for your current theme."
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Vous n'êtes plus dans le salon « %(room)s » ou « %(nick)s » l'a quitté."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Conversation avec "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Conversation continuée"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+"N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "L'enregistrement des conversations du salon est activé"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Le serveur à défini ou midifié votre Surnom de salon"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a été banni par %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s est maintenant connu en tant que %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s a été éjecté du salon (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "Changement d'affiliation"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "La configuration du salon a changé pour « membres seulement »"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "Extinction du système"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** L'affiliation de %(nick)s a été définie à %(affiliation)s par %(actor)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** L'affiliation de %(nick)s a été définie à %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Le rôle de %(nick)s a été défini à %(role)s par %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Le rôle de %(nick)s a été défini à %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s est maintenant %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Si vous fermez cette fenêtre, vous serez déconnecté(e) de ce salon."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Ne plus me poser la question"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruction de %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9009,22 +8571,22 @@ msgstr ""
 "Vous êtes sur le point de supprimer définitivement ce salon.\n"
 "Vous pouvez spécifier une raison ci-dessous :"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -9050,60 +8612,480 @@ msgid "Details"
 msgstr "Détails"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Erreur lors de l'analyse du fichier :"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "N'a pas pu écrire dans %s. La gestion des sessions ne fonctionnera pas"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim n'est pas le client Jabber par défaut"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Voulez vous faire de Gajim le client Jabber par défaut ?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Toujours vérifier que Gajim est le client Jabber par défaut au démarrage"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Extension non supportée"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "L'image ne peut être enregistrée en format %(type)s. Enregistrer en tant que "
 "%(new_filename)s ?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Le surnom que vous vouliez utiliser dans le salon %s est actuellement "
+"utilisé ou enregistré par un autre occupant.\n"
+"Veuillez entrer un autre surnom ci-dessous :"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Toujours utiliser ce pseudo en cas de conflit"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Acceptez vous sa requête ?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Acceptez vous cette requête sur le compte %s ?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Autorisation HTTP (%(method)s) pour %(url)s (id : %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "La connexion a échoué"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Erreur %(code)s : %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "erreur en envoyant %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Requête d'Inscription"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorisation acceptée"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Le contact \"%s\" vous a autorisé à voir son état."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Vous le/la verrez toujours hors-ligne.\n"
+"Voulez vous le/la supprimer de votre liste de contacts ?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Désinscrit(e)"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Le contact avec \"%s\" ne peut être établi"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s a changé le sujet en %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Le salon affiche dorénavant les membres non-disponibles"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "Le salon n'affiche plus les membres non-disponibles"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Un changement de la configuration du salon relatif à la vie-privée a eu lieu"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "L'enregistrement des conversations du salon est maintenant activé"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Le salon n'est plus anonyme"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Le salon est maintenant sami-anonyme"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Le salon est maintenant totalement anonyme"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
+"Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Vous avez configuré Gajim pour qu'il utilise un agent GPG, mais aucun agent "
+"GPG n'est lancé ou il a renvoyé un mauvais mot de passe.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Votre mot de passe est incorrect"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Mot de passe OpenGPG est incorrect"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "la clef GPG n'est pas une clef de confiance"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"La clef GPG utilisé pour chiffrer cette conversation n'est pas une clef de "
+"confiance. Voulez-vous vraiment chiffrer ce message ?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring est installé mais pas \t\t\t\tcorrectement démarré (variable "
+"d'environnement probablement \t\t\t\tmal configurée)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nouveau courriel sur %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Vous avez %d nouveau courrier électronique"
+msgstr[1] "Vous avez %d nouveaux courriers électroniques"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"De : %(from_address)s\n"
+"Sujet : %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s souhaite vous envoyer un fichier."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Le contact distant à stoppé le transfert"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Erreur à l'ouverture du fichier"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr ""
+"Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Impossible de déchiffrer le message de %s\n"
+"Il a peut-être été manipulé."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Impossible de déchiffrer le message"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Conflit de nom d'utilisateur"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping ?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong ! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Erreur."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Conflit de ressource"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en "
+"entrer une nouvelle"
+
+#: ../src/gui_interface.py:1771
+#, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s souhaite vous envoyer un fichier."
+
+#: ../src/gui_interface.py:1774
+msgid "Voice Chat Request"
+msgstr "Requête de transfert de fichier"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Erreur durant la vérification du certificat SSL"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Une erreur est survenue lors de la vérification du certificat SSL de votre "
+"serveur Jabber : %(error)s\n"
+"Voulez-vous toujours vous connecter à ce serveur ?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignorer cette erreur pour ce certificat."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Erreur de certificat SSL"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Le certificat SSL du compte %(account)s semble avoir changé, ou votre "
+"connexion est en train d'être « hackée ».\n"
+"Ancienne empreinte digitale : %(old)s\n"
+"Nouvelle empreinte digitale : %(new)s\n"
+"\n"
+"Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
+"certificat ?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Connexion non-sécurisée"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
+"chiffrée. Êtes vous sûr de vouloir le faire ?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
+"sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
+"sûr de vouloir le faire ?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "Le nœud PEP n'a pas été supprimé"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Émoticônes désactivées"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc "
+"désactivées."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Votre thème d'émoticônes n'a pu être chargé. Vous avez peut-être besoin de "
+"mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/"
+"wiki/Emoticons pour plus de détails."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr ""
+"Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
+"invisible."
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Impossible d'enregistrer vos informations de configuration"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Mot de Passe Requis"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr ""
+"Entrez votre mot de passe GPG pour la clé %(keyid)s (compte %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "Clef GPG expirée"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Votre clef GPG a expiré, vous serez connecté(e) à %s sans OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Mot de passe erroné"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Nouveau Salon de Discussion"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
@@ -9118,7 +9100,7 @@ msgstr "Contacts"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Date"
 
@@ -9129,7 +9111,7 @@ msgstr "Pseudonyme"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Message"
 
@@ -9155,192 +9137,188 @@ msgstr ""
 "\n"
 "Si vous choisissez OUI, patientez..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Exportation de l'historique..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s le %(time)s a dit: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Voulez vous réellement supprimer l'historique de ce contact ?"
 msgstr[1] "Voulez vous réellement supprimer l'historique de ces contacts ?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Ceci est une opération irréversible."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?"
 msgstr[1] "Voulez-vous vraiment supprimer les messages sélectionnés ?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historique de conversation avec %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Erreur du disque"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Message d'erreur : %s"
+msgstr "Erreur : %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Erreur."
+msgstr "Erreur"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Délai du chargement de l'image dépassé"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Vous n'êtes pas connecté au serveur"
+msgstr "Vous êtes sur le point de fermer plusieurs onglets"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Voulez-vous vraiment supprimer le message sélectionné ?"
+msgstr "Voulez-vous vraiment tous les fermer ?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Discussions"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Salons de discussion"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- les messages seront archivés"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- les messages ne seront pas archivés"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a changé d'état"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s s'est connecté(e)"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s s'est déconnecté(e)"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nouveau message simple de %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nouveau message privé dans le salon %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Message de %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nouveau message de %(nickname)s"
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:568
 msgid "Ignore"
-msgstr "_Ignorer"
+msgstr "Ignorer"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Récupération du profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Le fichier est vide"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Impossible de charger l'image"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Invitation reçue"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Vous devez être connecté pour publier vos informations."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Envoi du profil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "l'information n'a PAS été publiée"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9348,46 +9326,51 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" accepte cette requête, vous connaîtrez son état."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté(e)."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG n'est pas utilisable"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Vous serez connecté à %s sans OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9395,28 +9378,27 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "désynchronisé"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Vraiment quitter Gajim ?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
+msgstr "Êtes-vous sûr de vouloir quitter Gajim ?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Toujours fermer Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Vous avez des messages non lus"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9424,16 +9406,16 @@ msgstr ""
 "Les messages seront disponibles pour une lecture ultérieure si l'archivage "
 "de l'historique est actif et si le contact est dans votre liste."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Vous devez les lire avant de supprimer ce compte."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9441,11 +9423,11 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Les passerelles seront enlevées"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9454,71 +9436,73 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ces "
 "passerelles : %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
-"Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
+"Vous êtes sur le point de bloquer un contact. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Ce contact vous verra hors-ligne et vous ne recevrez pas les messages qu'il "
+"vous enverra."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Renommer le contact"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entrez un nouveau surnom pour le contact %s."
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "_Renommer le Groupe"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entrez un nouveau nom pour le groupe %s."
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "_Supprimer le Groupe"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Voulez-vous enlever le groupe %s de la liste de contacts ?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 "Supprimer également de votre roster tous les contacts appartenant à ce groupe"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez la clé correspondant au contact"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Le contact \"%s\" sera enlevé de la liste de contacts"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
+"Vous êtes sur le point de supprimer « %(name)s » (%(jid)s) de votre roster.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9527,11 +9511,11 @@ msgstr ""
 "verra donc toujours déconnecté(e)."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Voulez vous continuer ?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9539,16 +9523,16 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle "
 "vous verra donc toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Autoriser ce contact à connaître mon état après la suppression"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Les contacts seront enlevés de la liste de contacts"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9558,35 +9542,36 @@ msgstr ""
 "vous enlevez aussi leurs autorisations. Ces contacts vous verront donc "
 "toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
-"continuer ?"
+"Vous êtes sur le point d'envoyer un statut personnalisé. Êtes-vous sûr de "
+"vouloir continuer ?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Ce contact vous vera %(status)s, mais seulement jusqu'à ce que vous changiez "
+"votre statut. Il verra alors votre statut global."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Le stockage des métacontacts n'est pas supporté par votre serveur"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9595,14 +9580,14 @@ msgstr ""
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9612,183 +9597,182 @@ msgstr ""
 "Généralement, cela est utile lorsqu'une même personne possède plusieurs "
 "comptes Jabber ou des comptes de transport."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Voulez vous envoyer ce fichier à %s :"
 msgstr[1] "Voulez vous envoyer ces fichiers à %s :"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Envoyer %s"
+msgstr "Envoyer %s à %s"
 
-#: ../src/roster_window.py:4213
-#, fuzzy, python-format
+#: ../src/roster_window.py:4233
+#, python-format
 msgid "Make %s and %s metacontacts"
-msgstr "Envoyer un fichier à un contact"
+msgstr "Faire de %s et %s des métacontacts"
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "du compte %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "Gérer les marque-pages..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "du compte %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Configurer les Services..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Gérer les Contacts"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Envoyer un message Simple"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Gérer les Passerelles"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Déconnecter"
+msgstr "_Reconnecter"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Déconnecter"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Joindre un salon de discussion"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Attente de résultats."
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Erreur dans la forme des données reçues"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Aucun résultat."
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Erreur d'écriture du disque"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Sujet : %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Confirmer ces options de session"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9803,7 +9787,7 @@ msgstr ""
 "\n"
 "\tCes options sont-elles acceptables ?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9818,116 +9802,116 @@ msgstr ""
 "\n"
 "Continuer la session ?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Identifiant Jabber :"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Ressource : "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de ce salon"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [bloqué]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [minimisé]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "État : "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Dernier état : %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " depuis %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Déconnecté(e)"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Inscription : "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Ton :"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Type : "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Non commencé"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?transfer status:En pause"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Calé"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Ce service n'a pas encore renvoyé d'informations détaillées"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9935,36 +9919,35 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
-msgstr "Inconnu"
+msgstr "?Date:Inconnue"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "depuis %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation :</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 "Ce contact s'intéresse à votre état mais vous ne vous intéressez pas au sien"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9972,12 +9955,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "vôtre"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vous et ce contact vous intéressez à vos états réciproques"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9985,19 +9968,73 @@ msgstr ""
 "Vous n'êtes pas intéressé par l'état de ce contact et il ne s'intéresse pas "
 "au vôtre"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Vous attendez la réponse de ce contact pour votre demande de voir son état"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Il n'y a aucune requête d'inscription en attente."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "Message _entrant :"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "Message s_ortant :"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "L'hôte %s que vous avez spécifié dans l'option avancée "
+#~ "« ft_add_hosts_to_send » est invalide, il a été ignoré."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Mot de passe OpenPGP non renseigné"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Pour continuer à envoyer et recevoir des messages, vous devez vous "
+#~ "reconnecter."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Vous n'êtes pas connecté ou vous êtes invisible. Votre message n'a pas pu "
+#~ "être envoyé."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Ce message est chiffré]"
+
+#~ msgid "%i days ago"
+#~ msgstr "Il y a %i jours"
+
+#~ msgid "Trayicon"
+#~ msgstr "Trayicon"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Une icône dans le tray indiquant la présence courante."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Nécessite python-gnome2-extras ou une compilation du module trayicon "
+#~ "depuis les sources Gajim."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Nécessite PyGTK >= 2.10."
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Ajouter une notification spéciale"
 
@@ -10045,11 +10082,9 @@ msgstr " ressource avec la priorité "
 #~ msgstr ""
 #~ "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
 
-#, fuzzy
 #~ msgid "Nickname not found"
 #~ msgstr "Surnom introuvable : %s"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -10089,7 +10124,6 @@ msgstr " ressource avec la priorité "
 #~ "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
 #~ "salon@serveur en option on peut spécifier le surnom utilisé."
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
 #~ "nickname from the group chat and optionally displays a reason."
@@ -10122,7 +10156,6 @@ msgstr " ressource avec la priorité "
 #~ "Utilisation : /%s <message>, envoie un message sans chercher d'autres "
 #~ "commandes."
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
 #~ "messages."
@@ -10139,7 +10172,6 @@ msgstr " ressource avec la priorité "
 #~ msgid "Your JID:"
 #~ msgstr "Votre identifiant Jabber :"
 
-#, fuzzy
 #~ msgid "B_OSH Port:"
 #~ msgstr "_Port :"
 
@@ -10229,7 +10261,6 @@ msgstr " ressource avec la priorité "
 #~ msgstr ""
 #~ "Cette commande n'existe pas: /%s (précédez la de /say pour l'envoyer)"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <action>, sends action to the current group chat. Use third "
 #~ "person. (e.g. /%s explodes.)"
@@ -10237,11 +10268,9 @@ msgstr " ressource avec la priorité "
 #~ "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. "
 #~ "Utilise la troisième personne. (ex : /%(command)s explose.)"
 
-#, fuzzy
 #~ msgid "Encryption enabled"
 #~ msgstr "Chiffrement E2E activé"
 
-#, fuzzy
 #~ msgid "Encryption disabled"
 #~ msgstr "Chiffrement E2E désactivé"
 
diff --git a/po/gl.po b/po/gl.po
index 9d8c596b2..0db4cc0eb 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-12-06 22:12+0100\n"
 "PO-Revision-Date: 2009-08-19 23:51+0200\n"
 "Last-Translator: Iván Méndez López <>\n"
 "Language-Team:  <softwarelibre@udc.es>\n"
@@ -207,7 +207,7 @@ msgstr "_Servidor:"
 
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Varios</b>"
 
@@ -292,9 +292,9 @@ msgstr "_Editar a información persoal..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1156
+#: ../src/common/helpers.py:1168 ../src/notify.py:553 ../src/notify.py:574
+#: ../src/notify.py:612 ../src/notify.py:624
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -303,9 +303,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:59 ../src/common/contacts.py:140
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2747
+#: ../src/roster_window.py:5259
 msgid "General"
 msgstr "Xeral"
 
@@ -366,21 +366,21 @@ msgid "Information about you, as stored in the server"
 msgstr "A súa información, para se gardar no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1702
+#: ../src/config.py:2252
 msgid "No key selected"
 msgstr "Non se seleccionou ningunha chave"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1215
+#: ../src/config.py:1318 ../src/config.py:1606 ../src/config.py:1611
+#: ../src/config.py:2159 ../src/config.py:2238 ../src/config.py:2251
+#: ../src/config.py:3452 ../src/config.py:3525 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2801 ../src/roster_window.py:2807
+#: ../src/roster_window.py:2812
 msgid "None"
 msgstr "Ningún"
 
@@ -541,8 +541,8 @@ msgstr ""
 "Podería considerar mudar algúns aspectos da configuración da protección."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1729
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
@@ -556,7 +556,7 @@ msgid "Mer_ge accounts"
 msgstr "_Combinar as contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5214
 msgid "Re_name"
 msgstr "Re_nomear"
 
@@ -807,7 +807,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Condicións</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/glade/preferences_window.glade.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
@@ -824,7 +824,7 @@ msgid "All statuses"
 msgstr "Todos os estados"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../src/common/commands.py:106 ../src/common/helpers.py:231
 msgid "Away"
 msgstr "Ausente"
 
@@ -841,7 +841,7 @@ msgid "Have "
 msgstr "Ten "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:241
 msgid "Invisible"
 msgstr "Invisíbel"
 
@@ -850,7 +850,7 @@ msgid "Launch a command"
 msgstr "Enviar un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:214
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
@@ -973,7 +973,7 @@ msgstr "Última modificación:"
 msgid "New entry received"
 msgstr "Recibiuse unha entrada nova"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Recibiu unha entrada nova:"
 
@@ -1021,12 +1021,12 @@ msgstr "Insira o contrasinal novo:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Escriba a súa mensaxe nova de estado</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Activo"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Sala:"
@@ -1121,8 +1121,8 @@ msgstr "Editar os grupos"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5169
+#: ../src/roster_window.py:5324
 msgid "In_vite to"
 msgstr "Con_vidar"
 
@@ -1137,8 +1137,8 @@ msgid "Remo_ve"
 msgstr "_Eliminar"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5179
+#: ../src/roster_window.py:5411
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Envía XML personalizado"
@@ -1174,8 +1174,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Permitirlle ver o meu estado"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5238
+#: ../src/roster_window.py:5361 ../src/roster_window.py:5488
 msgid "_Block"
 msgstr ""
 
@@ -1186,7 +1186,7 @@ msgstr "Prohibirlle ver o meu estado"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5557
 msgid "_History"
 msgstr "_Historial"
 
@@ -1209,8 +1209,8 @@ msgid "_Subscription"
 msgstr "_Subscrición"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5232
+#: ../src/roster_window.py:5355 ../src/roster_window.py:5485
 msgid "_Unblock"
 msgstr ""
 
@@ -1306,7 +1306,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Cando unha transferencia se completar, amosa unha notificación emerxente"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1314,7 +1314,7 @@ msgstr "_Continuar"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificarme cando rematar unha transferencia"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Abrir un cartafol de contido"
 
@@ -1342,7 +1342,7 @@ msgstr ""
 "Contacto\n"
 "Báner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Negra"
 
@@ -1362,11 +1362,11 @@ msgstr "Personalización de temas do Gajim"
 msgid "Gone"
 msgstr "Marchei"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Itálica"
 
@@ -1417,7 +1417,7 @@ msgstr "Cambiar o _tema"
 msgid "Configure _Room..."
 msgstr "Configurar a sala"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1745
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Engadir esta sala aos marcadores"
@@ -1484,13 +1484,13 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Crear unha publicación nova"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:256
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Asunto"
 
@@ -1516,8 +1516,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Xestor do Historial de Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3005
+#: ../src/dialogs.py:3102
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1542,7 +1543,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Buscar na base de datos"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Historial de conversas"
 
@@ -1568,7 +1569,7 @@ msgstr "Historial de conversas"
 msgid "Bookmark this room"
 msgstr "Engadir esta sala aos marcadores"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2075
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
@@ -1596,8 +1597,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1305
+#: ../src/disco.py:1749
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1625,7 +1626,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Amosar o estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1719
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -1706,60 +1707,127 @@ msgstr "Tipo:"
 msgid "_Username:"
 msgstr "_Nome de usuario:"
 
-#: ../data/glade/message_window.glade.h:1
+#. # means number
+#: ../data/glade/message_window.glade.h:1 ../src/dialogs.py:3937
+msgid "#"
+msgstr "núm."
+
+#: ../data/glade/message_window.glade.h:2
+msgid "*"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:3
+#: ../data/glade/single_message_window.glade.h:1
+msgid "0"
+msgstr "0"
+
+#: ../data/glade/message_window.glade.h:4
+msgid "1"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:13
 #, fuzzy
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Engade o contacto á listaxe"
 
-#: ../data/glade/message_window.glade.h:2
+#: ../data/glade/message_window.glade.h:14
 #, fuzzy
 msgid "Bookmark this room (Ctrl+B)"
 msgstr "Engadir esta sala aos marcadores"
 
-#: ../data/glade/message_window.glade.h:3
+#: ../data/glade/message_window.glade.h:15
 msgid "Browse the chat history (Ctrl+H)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:4
+#: ../data/glade/message_window.glade.h:16
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:5
+#: ../data/glade/message_window.glade.h:17
 #, fuzzy
 msgid "Change your nickname (Ctrl+N)"
 msgstr "Cambiar o _alcume"
 
-#: ../data/glade/message_window.glade.h:6
+#: ../data/glade/message_window.glade.h:18
 #, fuzzy
 msgid "Invite contacts to the conversation (Ctrl+G)"
 msgstr "está a prestar atención á conversa"
 
-#: ../data/glade/message_window.glade.h:7
+#: ../data/glade/message_window.glade.h:19
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:20
 msgid "Send a file (Ctrl+F)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:8
+#: ../data/glade/message_window.glade.h:21
 #, fuzzy
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:9
+#: ../data/glade/message_window.glade.h:22
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#: ../data/glade/message_window.glade.h:23
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:11
+#: ../data/glade/message_window.glade.h:24
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
+#: ../data/glade/message_window.glade.h:25
+msgid "Sound volume:"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:26
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:27
+msgid "Toggle video session"
+msgstr ""
+
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/message_window.glade.h:13
+#: ../data/glade/message_window.glade.h:29
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1777,75 +1845,94 @@ msgstr "<b>Programas</b>"
 
 #: ../data/glade/preferences_window.glade.h:3
 #, fuzzy
-msgid "<b>Auto Status</b>"
+msgid "<b>Audio</b>"
 msgstr "<b>Accións</b>"
 
 #: ../data/glade/preferences_window.glade.h:4
 #, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Accións</b>"
+
+#: ../data/glade/preferences_window.glade.h:5
+#, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/glade/preferences_window.glade.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Cores do separador para os estados da charla</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/glade/preferences_window.glade.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notificacións visuais</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/glade/preferences_window.glade.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Condicións</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/glade/preferences_window.glade.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opcións de GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<i>Listaxe de privacidade</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Propiedades</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Engadir unha regra</b>"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificacións visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Avanzado"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:25
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1855,25 +1942,37 @@ msgstr ""
 "Só escribindo\n"
 "Desactivado"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:28
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envío de información sobre o sistema operativo"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
 "ocupado ou invisíbel."
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:31
 msgid "Ask status message when I:"
 msgstr "Preguntar a mensaxe de estado cando estea: "
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:32 ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:34
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:35
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1885,23 +1984,33 @@ msgstr ""
 "Detectar automaticamente en cada inicio do Gajim\n"
 "Usar sempre as aplicacións por defecto do GNOME\n"
 "Usar sempre as aplicacións por defecto do KDE\n"
-"Usar sempre as aplicacións por defecto do XFCE4\n"
+"Usar sempre as aplicacións por defecto do Xfce\n"
 "Personalizado"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
 msgid "Chat message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Configure color and font of the interface"
 msgstr "Configurar as cores e as fontes da interface"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:43
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Men_saxe de estado:"
+
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Nome de contacto"
+
+#: ../data/glade/preferences_window.glade.h:45
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1910,34 +2019,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:50
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Display _extra email details"
 msgstr "Amosar os detalles _extra nos correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Display a_vatars of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:55
 msgid "Display status _messages of contacts in roster"
 msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:56
 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 "
@@ -1947,7 +2056,7 @@ msgstr ""
 "estiver a manter cun contacto. Pode especificar aquí que estados de charla "
 "quere que se amosen nas fiestras."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:57
 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 "
@@ -1957,7 +2066,7 @@ msgstr ""
 "estiver a manter cun contacto. Pode especificar aquí que estados de charla "
 "quere enviarlle á outra persoa."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1965,19 +2074,19 @@ msgstr ""
 "O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
 "pantalla cando un contacto se desconectar"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1985,18 +2094,18 @@ msgstr ""
 "Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
 "de correos electrónicos novos"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2004,7 +2113,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2012,7 +2121,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as mensaxes de estado dos contactos "
 "debaixo do nome do contacto na listaxe e en grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2020,7 +2129,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2028,7 +2137,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2036,14 +2145,14 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:70
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2054,14 +2163,14 @@ msgstr ""
 "Emprégueo con precaución xa que bloqueará todas as mensaxes de calquera "
 "contacto que non estiver na súa listaxe de contactos."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:72
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:73
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2070,7 +2179,7 @@ msgstr ""
 "Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
 "de correos electrónicos novos"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:74
 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, "
@@ -2080,13 +2189,13 @@ msgstr ""
 "(por exemplo, un contacto de MSN terá a icona de MSN equivalente para o seu "
 "estado en liña, ausente, ocupado etc.)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:75
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2094,79 +2203,84 @@ msgstr ""
 "Se non está desactivado, o Gajim substituirá emoticonas ASCCI ':)' polo seu "
 "equivalente en iconas gráficas estáticas ou animadas"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Unha soa fiestra de conversa"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Ma_nage..."
 msgstr "Xestio_nar..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:83
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificar a conta"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:84
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar cando un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cando un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Notify on new _GMail email"
 msgstr "Notificar de novos correos de _GMail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "Personal Events"
 msgstr "Información persoal"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Play _sounds"
 msgstr "Reproducir _sons"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servidor:"
+
+#: ../data/glade/preferences_window.glade.h:94
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Mostrar o evento na área de notificación"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:95
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:96
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:97
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2174,30 +2288,30 @@ msgstr ""
 "Algunhas mensaxes poden incluír un contido adornado (formato, cores etc). Se "
 "isto está marcado, o Gajim amosará a mensaxe en bruto."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:98
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar os contacto_s polo estado"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:99 ../src/config.py:384
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:100
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Conxunto de _iconas de estado por defecto:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Style"
 msgstr "Atascado"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:102
 msgid "T_heme:"
 msgstr "Te_ma:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:103
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2205,7 +2319,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:106
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2213,114 +2327,124 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "_Usar as iconas do transporte"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:110
 msgid "Use system _default"
 msgstr "Usar o pre_definido do sistema"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:111
+msgid "Video input device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+msgid "Video output device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Cando se reciba un acontecemento novo"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:114
+#, fuzzy
+msgid "Your message:"
+msgstr "Mensaxe de erro: %s"
+
+#: ../data/glade/preferences_window.glade.h:115
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Ant_es do alcume:"
+
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Away after:"
 msgstr "Pór _ausente despois de:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:118
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Notificacións de estado nas charlas:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticonas:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_File manager:"
 msgstr "A_dministrador de ficheiros:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_Highlight misspelled words"
 msgstr "_Marcar os erros ortográficos"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 "_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignorar o contido adornado en mensaxes entrantes"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "Mens_axe entrante:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:124
 msgid "_Log status changes of contacts"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:125
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:126
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Pór _non dispoñíbel despois de:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:127
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Mensaxe saínte:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:128
 msgid "_Reset to Default Colors"
 msgstr "_Restabelecer as cores predeterminadas"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:129
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Notificacións de estado nas charlas:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:130
 msgid "_Status message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:131
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:132
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:133
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entrar nun grupo de charla"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:134
 #, fuzzy
 msgid "in _roster"
 msgstr "Non está na listaxe"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:135
 msgid "minutes"
 msgstr "minutos"
 
@@ -2373,7 +2497,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Orde:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3233
 msgid "Privacy List"
 msgstr "Listaxe de privacidade"
 
@@ -2537,7 +2661,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Propiedades</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Sons</b>"
@@ -2601,8 +2725,8 @@ msgstr "Eliminar a conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5371 ../src/roster_window.py:5498
 msgid "_Remove"
 msgstr "_Eliminar"
 
@@ -2621,14 +2745,14 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Eliminar"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_Aceptar"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr "Eliminar"
 
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
@@ -2689,7 +2813,7 @@ msgstr "_Accións"
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1466
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -2733,12 +2857,12 @@ msgid "_Add contact"
 msgstr "Engadir un _contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5510
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1317
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2758,14 +2882,6 @@ msgstr "Rexistrar en"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_Aceptar"
-
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
 #: ../data/glade/single_message_window.glade.h:2
 msgid "From:"
 msgstr "De:"
@@ -2981,338 +3097,325 @@ msgstr "Recurso:"
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Información"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Activated"
 msgstr "Activo"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Deactivated"
 msgstr "Inactivo"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 #, fuzzy
 msgid "Integer"
 msgstr "No grupo"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Nome da opción"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Ningún)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Oculta"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Recibiu unha entrada nova:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Recibiu unha entrada nova:"
+msgstr[1] "Recibiu unha entrada nova:"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Inglés"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Belarusian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Breton"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "British"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Basque"
 msgstr "Éuscaro"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Noruegués b"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Norwegian"
 msgstr "Noruegués"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Portugués do Brasil"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Serbian"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Chinés (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Idioma do corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "A súa mensaxe non se enviará mentres non estiver conectado."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "nove"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Alcume"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "_Letra:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Información"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1420 ../src/chat_control.py:1883
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifrado activado"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1445 ../src/common/contacts.py:157
+#: ../src/common/contacts.py:274 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:243 ../src/dialogs.py:1060 ../src/dialogs.py:1972
+#: ../src/dialogs.py:2001 ../src/gui_interface.py:606
+#: ../src/gui_menu_builder.py:251 ../src/gui_menu_builder.py:394
+#: ../src/roster_window.py:1575 ../src/roster_window.py:1577
+#: ../src/roster_window.py:1892 ../src/roster_window.py:3195
+#: ../src/roster_window.py:3221
 msgid "Not in Roster"
 msgstr "Non está na listaxe"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1489
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1492
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1573
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1751
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1863 ../src/dialogs.py:4619
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1864
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1873
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1899
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1901
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1918
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1918
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1920
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1920
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1924
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1928
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
@@ -3320,58 +3423,58 @@ msgstr "Usar a autenticación"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1935
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2075
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2084
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2087
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2089
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2094
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2096
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2133 ../src/chat_control.py:2146
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2139
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2408
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2409
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3379,136 +3482,136 @@ msgstr ""
 "Se pecha este separador e ten o historial desactivado, esta mensaxe "
 "perderase."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2552 ../src/common/connection_handlers.py:2158
+#: ../src/common/connection_handlers.py:2204
+#: ../src/common/connection_handlers.py:2398
+#: ../src/common/connection_handlers.py:2543 ../src/common/connection.py:432
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2553
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2791
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "a crear a base de datos de rexistros"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:122 ../src/common/check_paths.py:133
+#: ../src/common/check_paths.py:140
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é un ficheiro mais podería ser un directorio"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:123 ../src/common/check_paths.py:134
+#: ../src/common/check_paths.py:141 ../src/common/check_paths.py:149
 msgid "Gajim will now exit"
 msgstr "Gajim pecharase agora"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:148
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é un directorio mais podería ser un ficheiro"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:164
 #, python-format
 msgid "creating %s directory"
 msgstr "a crear un directorio %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 #, fuzzy
 msgid "Change status information"
 msgstr "Información"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 #, fuzzy
 msgid "Change status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 #, fuzzy
 msgid "Free for chat"
 msgstr "Libre para falar"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 #, fuzzy
 msgid "Online"
 msgstr "nove"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Non molestar."
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 #, fuzzy
 msgid "Presence description:"
 msgstr "Descrición do erro..."
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Novo grupo de charla"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s entrou no grupo de charla"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:212 ../src/common/contacts.py:136
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1579 ../src/roster_window.py:1581
+#: ../src/roster_window.py:5139
 #, fuzzy
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Xa está na sala %s"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d mensaxe sen ler"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3607,9 +3710,9 @@ msgstr ""
 "Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:487
+#: ../src/common/optparser.py:283 ../src/common/optparser.py:479
+#: ../src/common/optparser.py:513 ../src/gui_interface.py:3231
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
@@ -4169,7 +4272,11 @@ msgid ""
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:279
+msgid "STUN server to use when using jingle"
+msgstr ""
+
+#: ../src/common/config.py:291
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4177,79 +4284,79 @@ msgstr ""
 "A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
 "están definidas nas opcións de autoprioridade_*"
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:299
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:300
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:302
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:303
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:306
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:308
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:309
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:310
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:311
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:312
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:314
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:323
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:324
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:328
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:332
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:335
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4257,125 +4364,125 @@ msgstr ""
 "Se isto está marcado, o Gajim usará o seu IP e proxies que se definen na "
 "opción file_transfer_proxies para a súa transferencia."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:349
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:350
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:358
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:421
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Está o OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:422
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:423 ../src/common/config.py:426
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingua en que se comprobarán os erros ortográficos"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:432
 msgid "all or space separated status"
 msgstr "estado separado por espazos ou all"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:433
 msgid "'yes', 'no', or 'both'"
 msgstr "'si', 'non' ou 'ambos'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:434 ../src/common/config.py:436
+#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:441
 msgid "'yes', 'no' or ''"
 msgstr "'si', 'non' ou ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:447 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:448
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:448
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:449 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:449
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, déixeme unha mensaxe."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:450
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:450
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:451 ../src/common/pep.py:186
 msgid "Working"
 msgstr "A traballar"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:451
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:452
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:452
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:453
 msgid "Out"
 msgstr "Fóra"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:453
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:464
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:465
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:466 ../src/config.py:1534
 msgid "Be right back."
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:469 ../src/common/config.py:470
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:480
 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."
@@ -4384,107 +4491,106 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:481
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:490 ../src/common/optparser.py:297
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:494 ../src/common/optparser.py:283
 msgid "grocery"
 msgstr "ultramariño"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:502
 msgid "marine"
 msgstr "mariño"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:257
 msgid "Wrong host"
 msgstr "Host errado"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:258
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:723
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "A información de rexistro para o transporte %s non chegou a tempo"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:730
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Rexistrar %s"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:731
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:733
 #, fuzzy
 msgid "Registration failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:733
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1037
+#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2202
+#: ../src/common/connection_handlers.py:2396
+#: ../src/common/connection_handlers.py:2541 ../src/common/connection.py:430
+#: ../src/gajim.py:353
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1260 ../src/common/connection.py:1431
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1261 ../src/common/connection.py:1432
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1977 ../src/common/connection.py:245
+#: ../src/config.py:1996 ../src/config.py:2005 ../src/config.py:2064
+#: ../src/config.py:3416 ../src/dataforms_widget.py:577 ../src/dialogs.py:2779
 msgid "Invalid Jabber ID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1978
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2159
+#: ../src/common/connection_handlers.py:2205
+#: ../src/common/connection_handlers.py:2399
+#: ../src/common/connection_handlers.py:2544 ../src/common/connection.py:433
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2251
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alcume non permitido: %s"
@@ -4492,77 +4598,77 @@ msgstr "Alcume non permitido: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2346
+#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:2360
+#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2366
+#: ../src/common/connection_handlers.py:2370 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2347
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2355
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2361
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2364
 msgid "Group chat creation is restricted."
 msgstr "A creación de grupos de charla está restrinxida."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2367
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "É necesario usar o alcume rexistrado."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2371
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non está na listaxe de membros"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2414
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2422
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2453
 msgid "I would like to add you to my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2474
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2476
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "solicitude de eliminación de subscrición de %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2478
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "xa non estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2673
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4702,189 +4808,186 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:246 ../src/dialogs.py:2780
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Non se pode enviar ficheiros baleiros"
+
+#: ../src/common/connection.py:268
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:271
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:319
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
+
+#: ../src/common/connection.py:420
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Asunto: %s\n"
+"%s"
+
+#: ../src/common/connection.py:770
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:771
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:783
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:817
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:830
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:845
 msgid "Invalid answer"
 msgstr "A resposta non é válida"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:846
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1127 ../src/common/connection.py:1256
+#: ../src/common/connection.py:1735
+#: ../src/common/zeroconf/connection_zeroconf.py:191
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1128 ../src/gui_interface.py:700
 msgid "Check your connection or try again later."
 msgstr "Comprobe a súa conexión ou probe máis tarde."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1133
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1146
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1177 ../src/common/connection.py:1236
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1178 ../src/common/connection.py:1237
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1203
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1206
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1208
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1257
 msgid "Check your connection or try again later"
 msgstr "Comprobe a súa conexión ou probe máis tarde"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1288
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Fallou a autenticación con \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1290
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprobe que o seu nome de usuario e o seu contrasinal sexan os "
 "correctos."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1354
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1355
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Non se pode enviar ficheiros baleiros"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Asunto: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1601
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1604
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contactos"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1769 ../src/common/connection.py:1792
 msgid "Not fetched because of invisible status"
 msgstr "Non se conseguiu debido ao estado invisíbel"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2196
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2197
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:134 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:606
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:138 ../src/common/contacts.py:357
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1463 ../src/gui_interface.py:411
+#: ../src/roster_window.py:848 ../src/roster_window.py:1500
+#: ../src/roster_window.py:1571 ../src/roster_window.py:1573
+#: ../src/roster_window.py:1731
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:365
 #, fuzzy
 msgid "Not in roster"
 msgstr "Non está na listaxe"
@@ -4903,29 +5006,35 @@ msgstr "Non se poden empregar as capacidades D-Bus de Gajim"
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "falta a dependencia pysqlite2 (tcc python-pysqlite2). A saír..."
-
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "O nome da conta non pode estar baleiro."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "O servizo non está dispoñíbel: o Gajim non se está a executar, ou "
 "remote_control está en Falso"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"O bus da sesión non está dispoñíbel.\n"
+"Probe a ler http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "O bus da sesión non está dispoñíbel.\n"
 "Probe a ler http://trac.gajim.org/wiki/GajimDBus"
@@ -5093,240 +5202,273 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:149
 msgid "Invalid character in username."
 msgstr "Hai un caracter non válido no nome de usuario."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:154
 msgid "Server address required."
 msgstr "É necesario o enderezo do servidor."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:160
 msgid "Invalid character in hostname."
 msgstr "Carácter non válido no nome do host."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:167
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:207
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:209
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:212
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:217
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:219
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:222
 msgid "_Available"
 msgstr "En liñ_a"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:224 ../src/features_window.py:118
 msgid "Available"
 msgstr "En líña"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:226
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:229
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:234
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:236
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:239
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:245
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:252
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:254
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:258
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:266
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:268
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:277
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:280
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:282
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:285
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:287
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:290
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:292
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:298
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:300
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:302
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:304
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:343
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:345
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:347
 msgid "is composing a message..."
 msgstr "está a escribir..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:350
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:352
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:617
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:620
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:624
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:627
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:631
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:634
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:637
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1112
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar a mensaxe"
 msgstr[1] "Enviar a mensaxe"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1118
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1121 ../src/common/helpers.py:1140
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1123
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1130 ../src/common/helpers.py:1137
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1170
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/jingle_rtp.py:98
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Configuración da sala"
+
+#: ../src/common/jingle_rtp.py:99
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:285
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:288
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:317
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:325
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5337,16 +5479,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:52
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: non se pode abrir %s para lectura"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:292 ../src/common/optparser.py:293
 msgid "cyan"
 msgstr "ciano"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:372
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrando os rexistros da base de datos aos índices"
@@ -5356,705 +5498,724 @@ msgstr "migrando os rexistros da base de datos aos índices"
 msgid "XMPP account %s@%s"
 msgstr "da conta %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "Pausado"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Negra"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Brave"
 msgstr "Ten "
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Charlas"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Negra"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Contidos"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completado"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Contidos"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Inactivo"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Eliminar"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Disappointed"
 msgstr "Desactivado"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Dismayed"
 msgstr "Desactivado"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Distracted"
 msgstr "Desactivado"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "mensaxe"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisíbel"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "unha"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Alemán"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "_Modificar"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Desconectado"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "once"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "Atascado"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "Última modificación:"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "Alcume"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "A durmir"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Rúa:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Engadiuse"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Hora"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "nove"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host errado"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Serán"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "A compor"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "Mañá"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "todos no grupo"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Serán"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "A expulsar %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entrar"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "A comer"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cambiando o asunto"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "A expulsar %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "A comer"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "A expulsar %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "A comer"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "_Desconectar"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "A comer"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "Motivo"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Motivo"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "A durmir"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "A comer"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Estou a ver un filme."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "A comer"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Estou a falar por teléfono."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "A transferir"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "A compor"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 #, fuzzy
 msgid "On a Train"
 msgstr "_Abrir como ligazón"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "A compor"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "A traballar"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:90
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Non se pode conectar ao porto %s."
 
-#: ../src/common/socks5.py:87
+#: ../src/common/socks5.py:91
 #, fuzzy
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
@@ -6064,42 +6225,17 @@ msgstr ""
 "cancelarase."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"O host que configurou como a opción avanzada ft_override_host_to_send non é "
-"valido e ignorarase."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Non se facilitou a chave de OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Conectarase a %s sen o OpenPGP"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Para continuar a enviar e recibir mensaxes, precisa volver conectarse."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:180
 msgid "Avahi error"
 msgstr "Erro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 #, python-format
 msgid ""
 "%s\n"
@@ -6108,55 +6244,46 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:201
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "Could not start local service"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:202
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Non foi posíbel ligar ao porto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:284
+#: ../src/common/zeroconf/connection_zeroconf.py:295
+#: ../src/common/zeroconf/connection_zeroconf.py:309
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Non foi posíbel cambiar o estado da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Non está conectado ou está invisíbel aos máis. A súa mensaxe non se puido "
-"enviar "
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Esta mensaxe está cifrada]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:326
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:336
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6169,26 +6296,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:164 ../src/config.py:622
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../src/config.py:396
+#: ../src/config.py:390
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensaxes de estado por defecto"
 
-#: ../src/config.py:405
+#: ../src/config.py:399
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:690 ../src/dialogs.py:1364
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Non está dispoñíbel o dicionario para o idioma %s"
 
-#: ../src/config.py:664
+#: ../src/config.py:691
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6197,72 +6324,72 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1149
 msgid "status message title"
 msgstr "título da mensaxe de estado"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1149
 msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1450 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3012 ../src/disco.py:830 ../src/disco.py:1689
+#: ../src/disco.py:1991 ../src/history_window.py:89
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1543
 msgid "Relogin now?"
 msgstr "Quere reconectarse agora?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1544
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se quere que se apliquen todos os cambios instantaneamente, debe "
 "reconectarse."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1676 ../src/config.py:1801
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1841 ../src/config.py:1885
 msgid "Unread events"
 msgstr "Acontecementos sen ler"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1842
 msgid "Read all pending events before removing this account."
 msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1868
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Comezou unha charla coa conta %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1869
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1881 ../src/config.py:2404 ../src/config.py:2438
 msgid "You are currently connected to the server"
 msgstr "Está actualmente conectado ao servidor"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1882
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:1765
+#: ../src/config.py:1886
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar o nome da conta, debe ler o resto de\n"
 "acontecementos pendentes"
 
-#: ../src/config.py:1771
+#: ../src/config.py:1892
 msgid "Account Name Already Used"
 msgstr "O nome da conta xa está en uso"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1893
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6270,148 +6397,148 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1897 ../src/config.py:1901
 msgid "Invalid account name"
 msgstr "O nome da conta non é válido"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1898
 msgid "Account name cannot be empty."
 msgstr "O nome da conta non pode estar baleiro."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1902
 msgid "Account name cannot contain spaces."
 msgstr "O nome da conta non pode conter espazos."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1977
 #, fuzzy
 msgid "Rename Account"
 msgstr "Xestionar as contas"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1978
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:2006
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Unha ID de Jabber debe estar na forma \"usuario@nomeservidor\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2214 ../src/config.py:3462
 msgid "Invalid entry"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2215 ../src/config.py:3463
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: ../src/config.py:2115
+#: ../src/config.py:2236
 msgid "Failed to get secret keys"
 msgstr "Produciuse un erro ao obter as chaves secretas"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2237
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Houbo un problema ao recuperar as súas chaves secretas de OpenPGP"
 
-#: ../src/config.py:2150
+#: ../src/config.py:2271
 msgid "OpenPGP Key Selection"
 msgstr "Selección da chave de OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2272
 msgid "Choose your OpenPGP key"
 msgstr "Elixa a súa chave de OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2279
 msgid "No such account available"
 msgstr "Non está dispoñíbel esta conta"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2280
 msgid "You must create your account before editing your personal information."
 msgstr "Debe crear unha conta antes de editar a súa información persoal"
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2287 ../src/dialogs.py:2030 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:476 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2288
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sen unha conexión, non pode editar a súa información persoal"
 
-#: ../src/config.py:2171
+#: ../src/config.py:2292
 msgid "Your server doesn't support Vcard"
 msgstr "O seu servidor non admite o vCard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2293
 msgid "Your server can't save your personal information."
 msgstr "O seu servidor non pode gardar a súa información persoal."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2405 ../src/config.py:2439
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:2289
+#: ../src/config.py:2410
 msgid "Account Local already exists."
 msgstr "A conta local xa existe."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2411
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor, volva darlle nome ou elimíneo antes de habilitar a mensaxaría de "
 "ligazón local."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2566
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2568
 #, python-format
 msgid "Register to %s"
 msgstr "Rexistrar %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2604
 msgid "Ban List"
 msgstr "Listaxe de expulsión"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2605
 msgid "Member List"
 msgstr "Listaxe de membros"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2606
 msgid "Owner List"
 msgstr "Listaxe de propietarios"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2607
 msgid "Administrator List"
 msgstr "Listaxe de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2656 ../src/disco.py:837 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2666
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2673
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2679
 msgid "Role"
 msgstr "Posto"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2706
 msgid "Banning..."
 msgstr "A expulsar..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2708
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6419,11 +6546,11 @@ msgstr ""
 "<b>A quen quere expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2710
 msgid "Adding Member..."
 msgstr "A engadir o membro..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2711
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6431,11 +6558,11 @@ msgstr ""
 "<b>A quen quere facer membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2713
 msgid "Adding Owner..."
 msgstr "A engadir un propietario..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2714
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6444,11 +6571,11 @@ msgstr ""
 "<b>A quen quere facer como propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2716
 msgid "Adding Administrator..."
 msgstr "A engadir administrador..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2717
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6456,7 +6583,7 @@ msgstr ""
 "<b>A quen quere facer como administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2718
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6473,59 +6600,60 @@ msgstr ""
 "usuario@dominio, dominio/recurso ou enderezo que contén\n"
 "un subdominio."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2819
 #, python-format
 msgid "Removing %s account"
 msgstr "A eliminar a conta %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2841 ../src/gui_interface.py:1097
+#: ../src/gui_interface.py:1192
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2842 ../src/gui_interface.py:1172
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2843 ../src/gui_interface.py:1192
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2852
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2853
 msgid "If you remove it, the connection will be lost."
 msgstr "Se a elimina, perderase a conexión co servidor"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2951
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2951
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2952
 msgid "Enter and leave only"
 msgstr "Entrar e saír soamente"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2953
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
 
-#: ../src/config.py:2889
+#: ../src/config.py:3023
 msgid "New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3056
 msgid "This bookmark has invalid data"
 msgstr "Este marcador ten información que non é válida"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3057
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6533,31 +6661,31 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3175 ../src/dialogs.py:1828
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3176 ../src/config.py:3190 ../src/config.py:3204
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcume non permitido: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3189 ../src/config.py:3438
 #, fuzzy
 msgid "Invalid server"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3203
 #, fuzzy
 msgid "Invalid room"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3355
 msgid "Account has been added successfully"
 msgstr "A conta engadiuse con éxito"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3356 ../src/config.py:3362
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6567,34 +6695,34 @@ msgstr ""
 "Pode configurar opcións avanzadas da conta se preme o botón Avanzado, ou "
 "máis tarde mediante o submenú Contas do menú Editar da fiestra principal."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3361
 msgid "Your new account has been created successfully"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3399
 msgid "Invalid username"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3401
 msgid "You must provide a username to configure this account."
 msgstr "Debe pórlle un nome para configurar esta conta."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3439
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3495 ../src/gui_interface.py:1841
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3496 ../src/gui_interface.py:1842
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3566
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6604,7 +6732,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3572 ../src/gui_interface.py:1866
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6612,73 +6740,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3599 ../src/config.py:3626
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3693
 msgid "Account name is in use"
 msgstr "O nome da conta está en uso"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3694
 msgid "You already have an account using this name."
 msgstr "Xa ten unha conta en que emprega este nome"
 
-#: ../src/config.py:3704
+#: ../src/config.py:3847
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3855
 msgid "Event"
 msgstr "Acontecemento"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3890
 msgid "First Message Received"
 msgstr "Recibiuse a primeira mensaxe"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3891
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3893
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3894
 msgid "Contact Connected"
 msgstr "Nome de contacto"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3895
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3896
 msgid "Message Sent"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3897
 msgid "Group Chat Message Highlight"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3898
 msgid "Group Chat Message Received"
 msgstr "Recibiuse unha mensaxe de grupo de charla"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3899
 msgid "GMail Email Received"
 msgstr "Recibiuse un correo de GMail"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:598
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:617
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6687,125 +6815,122 @@ msgstr ""
 "O texto que está debaixo desta liña foi o que se dixo desde a última vez que "
 "lle prestou atención a esta sala de charla"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:736
 #, fuzzy
 msgid "_Quote"
 msgstr "_Saír"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:755
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:760
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:777
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" no URL do dicionario e non está no WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:790
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:793
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:799
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1285
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Onte"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "hai %i días"
+msgid_plural "%i days ago"
+msgstr[0] "Onte"
+msgstr[1] "Onte"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1320 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de MI de Jabber"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "No grupo"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "Chave ID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Nome de contacto"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir a MDD"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaxe de estado %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6813,107 +6938,107 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Gardar como mensaxe de estado predefinido"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Enderezo de AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Enderezo de MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Enderezo de Yahoo!:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduza a información do contacto que quere engadir á conta %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "A ID de usuario non é válida"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario non contén un recurso."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Desenvolvedores actuais:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Desenvolvedores anteriores:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "AGRADECEMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Por último mais non menos importante, queremos agradecerlles a todos os "
 "mantedores de paquetes."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1197
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1365
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6924,105 +7049,110 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1829 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1947
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitude de subscrición para a conta %s de %s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1950
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitude de subscrición de %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2025 ../src/gui_interface.py:2576
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Xa está na sala %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2031
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2073
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar nun grupo de charla coa conta %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "O nome da conta non é válido"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1774
 msgid "Invalid group chat Jabber ID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr ""
+"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1775
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non é o nome dun grupo de charla."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar a charla coa conta %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7031,302 +7161,324 @@ msgstr ""
 "enviar unha mensaxe de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2765 ../src/dialogs.py:2927
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2766 ../src/dialogs.py:2928
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Non se pode analizar \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "O contrasinal non é válido"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Debe introducir un contrasinal."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2467 ../src/notify.py:263 ../src/notify.py:499
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2469 ../src/notify.py:271 ../src/notify.py:501
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2471 ../src/notify.py:292 ../src/notify.py:344
+#: ../src/notify.py:503
 msgid "New Message"
 msgstr "Mensaxe nova"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2471 ../src/notify.py:275 ../src/notify.py:345
+#: ../src/notify.py:503
 msgid "New Single Message"
 msgstr "Mensaxe nova"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2472 ../src/notify.py:281 ../src/notify.py:345
+#: ../src/notify.py:504
 msgid "New Private Message"
 msgstr "Mensaxe privada nova"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2472 ../src/gui_interface.py:1305 ../src/notify.py:513
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1368 ../src/notify.py:506
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1273
+#: ../src/gui_interface.py:1337 ../src/notify.py:508
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1413
+#: ../src/gui_interface.py:1435 ../src/gui_interface.py:1452
+#: ../src/notify.py:510
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2479 ../src/gui_interface.py:1416 ../src/notify.py:511
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1116 ../src/notify.py:515
 msgid "Groupchat Invitation"
 msgstr "Convite a grupo de charla"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2483 ../src/notify.py:255 ../src/notify.py:517
 msgid "Contact Changed Status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2684
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2688
 msgid "Single Message"
 msgstr "Mensaxe:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2691
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2714
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2737
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Estou %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2816
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2817
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2866
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2868
 msgid "XML Console"
 msgstr "Consola XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2956
+#, fuzzy
+msgid "add"
+msgstr "Atascado"
+
+#: ../src/dialogs.py:2956
+#, fuzzy
+msgid "modify"
+msgstr "_Modificar"
+
+#: ../src/dialogs.py:2957
+#, fuzzy
+msgid "remove"
+msgstr "_Eliminar"
+
+#: ../src/dialogs.py:2985
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3001 ../src/dialogs.py:3047
 #, fuzzy
 msgid "Add"
 msgstr "Enderezo"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3078
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3009
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3015
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3123
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3137
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Engadir un _contacto"
+
+#: ../src/dialogs.py:3174
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Elimina o contacto da listaxe"
+
+#: ../src/dialogs.py:3227
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Listaxe de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3231
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3287
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orde: %s, acción: %s, tipo: %s, valor: %s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3292
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orde: %s, acción: %s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3336
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3447
 msgid "<b>Add a rule</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3547
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listaxes de privacidade para %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3549
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3619
 msgid "Invalid List Name"
 msgstr "O nome de listaxe non é válido"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3620
 msgid "You must enter a name to create a privacy list."
 msgstr "Debe introducir un nome para crear unha listaxe de privacidade."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3652
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3655
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3657
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3665
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3667
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3728
 msgid "Choose Sound"
 msgstr "Elixir un son"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3738 ../src/dialogs.py:3794
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3743
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3781
 msgid "Choose Image"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3799
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3866
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cando %s estea:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
-#. # means number
-#: ../src/dialogs.py:3804
-msgid "#"
-msgstr "núm."
-
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3943
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4063
 msgid "when I am "
 msgstr "cando estea "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4539
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7334,38 +7486,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4542
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4548 ../src/dialogs.py:4632
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4554
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4559
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4562 ../src/dialogs.py:4613 ../src/dialogs.py:4626
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4567
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4578
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4579
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7375,31 +7527,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4580
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4614
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4620
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4627
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4633
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4698
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4700
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4702
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4706
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Outros"
@@ -7409,24 +7580,24 @@ msgstr "Outros"
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:477
 msgid "Without a connection, you can not browse available services"
 msgstr "Sen unha conexión non pode navegar polos servizos dispoñíbeis"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:553
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Xestión de servizos coa conta %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:555
 msgid "Service Discovery"
 msgstr "Xestión de servizos"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:705
 msgid "The service could not be found"
 msgstr "O servizo non se achou"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:706
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7434,341 +7605,332 @@ msgstr ""
 "Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
 "e ténteo máis tarde."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:710 ../src/disco.py:1046
 msgid "The service is not browsable"
 msgstr "O servizo non é navegábel"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:711
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de servizo non contén ningún elemento para navegar."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:750 ../src/disco.py:760
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:814
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s coa conta %s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:858
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1047
 msgid "This service does not contain any items to browse."
 msgstr "Este servizo non contén elementos para navegar."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1287
 #, fuzzy
 msgid "_Execute Command"
 msgstr "Executar o _comando..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1297 ../src/disco.py:1468
 msgid "Re_gister"
 msgstr "_Subscribir"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1509
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1699
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1707
 msgid "Description"
 msgstr "Descrición"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1715
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1780 ../src/gui_interface.py:3068
 msgid "Bookmark already set"
 msgstr "O marcador xa se definiu"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1781 ../src/gui_interface.py:3069
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" xa está nos seus marcadores."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1790 ../src/gui_interface.py:3082
 msgid "Bookmark has been added successfully"
 msgstr "O marcador engadiuse con éxito"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1791 ../src/gui_interface.py:3083
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2000
 msgid "Subscribed"
 msgstr "Engadiuse"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2008
 #, fuzzy
 msgid "Node"
 msgstr "Ningún"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2072
 msgid "New post"
 msgstr "Publicación nova"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2078
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2084
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Comandos: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Cifrado OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Mens_axe entrante:"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "Historial"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Modificar a conta"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Adaptar ao estado"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Cifrado OpenPGP"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Mens_axe entrante:"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Xeral"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "Características dos servidores"
@@ -7785,175 +7947,175 @@ msgstr "Hora"
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Vostede"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Remitente: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Cancelouse a transferencia do ficheiro"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Non se puido estabelecer a conexión co cliente."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Elixa un ficheiro para enviar..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Descrición: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "O Gajim non pode acceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Outro proceso está a usar este ficheiro."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Descrición: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quere enviarlle un ficheiro:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:888
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non se pode sobrescribir o ficheiro existente \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:890
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Xa existe un ficheiro con este nome e non ten permiso para o sobreescribir"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:894
 msgid "This file already exists"
 msgstr "Este ficheiro xa existe"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:894
 msgid "What do you want to do?"
 msgstr "Que quere facer?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:901
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Non se pode escribir no directorio \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:902
 msgid "You do not have permission to create files in this directory."
 msgstr "Non ten autorización para crear ficheiros neste directorio."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Gardar o ficheiro como..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
-msgstr "%(horas)02.d:%(minutos)02.d:%(segundos)02.d"
+msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "O ficheiro non é válido"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pausa"
 
@@ -7969,22 +8131,22 @@ msgstr ""
 
 #: ../src/gajim.py:180
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior"
 
 #: ../src/gajim.py:181
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior para funcionar. A abortar..."
 
 #: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "O Gajim precisa un GTK 2.6 ou superior"
 
 #: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "O Gajim precisa un GTK 2.6 ou superior para funcionar. A abortar..."
 
 #: ../src/gajim.py:189
@@ -8025,11 +8187,11 @@ msgstr ""
 "obtelo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:327
 msgid "Gajim is already running"
 msgstr "O Gajim xa está a se executar"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:328
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8037,431 +8199,29 @@ msgstr ""
 "Outra instancia dO Gajim semella estar xa en execución\n"
 "Quere executar unha outra?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "É necesario o contrasinal"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Introduza o contrasinal GPG para a conta %s"
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Conectarase a %s sen o OpenPGP"
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "O contrasinal é incorrecto"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"O seu alcume da súa preferencia está en uso ou rexistrado por outro "
-"ocupante. \n"
-"Por favor, especifique outro alcume abaixo:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Acepta esta solicitude?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Acepta esta solicitude?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Autorización HTTP (%s) para %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Fallou a conexión"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "produciuse un erro mentres se enviaba %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Solicitude de subscrición"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorización aceptada"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "O contacto \"%s\" autorizouno para ver o seu estado."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "O contacto \"%s\" eliminou a súa subscrición"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Eliminar"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s coñéceselle como %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s está agora %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "É necesario un contrasinal para entrar a este grupo de charla."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Está actualmente conectado sen a súa chave de GPG"
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "O contrasinal é incorrecto"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "O contrasinal é incorrecto"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Non me preguntar outra vez"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Hai un correo novo en %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Ten %d nova conversa de correo"
-msgstr[1] "Ten %d novas conversas de correo"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s quere enviarlle un ficheiro."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Elimina o contacto da listaxe"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Erro ao ler o ficheiro:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Recibiu con éxito o ficheiro %(ficheiro)s de %(nome)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Detívose a transferencia do ficheiro %(ficheiro)s de %(nome)s."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Envioulle con éxito o ficheiro %(filename)s a %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Detívose a transferencia de %(filename)s a %(name)s."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "En cada _mensaxe"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Conflito co nome de usuario"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Conflito co nome de usuario"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Conexión"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Cifrado desactivado"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Non se poden gardar as preferencias"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Amosa axuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "amosar axuda sobre un comando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8470,51 +8230,51 @@ msgstr ""
 "Amosa unha listaxe de todos os contactos na listaxe. Cada contacto aparece "
 "nunha liña distinta"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "amosar só contactos da conta especificada"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Amosa unha listaxe de contas que están rexistradas"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "mensaxe"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "mensaxe de estado"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8523,22 +8283,22 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Pr_ioridade:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quero _rexistrar unha conta nova de Jabber"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8548,23 +8308,23 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Amosa o diálogo de charla para enviarlle mensaxes a un contacto"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto co que quere conversar"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se se especifica, o contacto obtense da listaxe desta conta"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8574,29 +8334,29 @@ msgstr ""
 "OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "contido da mensaxe"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se se especifica, a mensaxe cifrarase mediante a súa chave pública"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "se se especifica, a mensaxe enviarase a través desta conta"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8606,140 +8366,140 @@ msgstr ""
 "OpenPGP como a conta son optativas. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Obter información detallada dun contacto"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "ficheiro"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "a 'entrada' é o nome da preferencia, o 'valor' é o do valor para definir"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe o estado actual da preferencias do Gajim para o ficheiro de "
 "configuración"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Engade o contacto á listaxe"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Engade un contacto novo a esta conta."
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devolve o estado actual (o global se non se especificar unha conta)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devolve a mensaxe de estado actual (o global se non se especificar unha "
 "conta)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Devolve o número de mensaxes sen ler"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre o diálogo de iniciar charla"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Iniciar unha charla con esta conta"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML para enviar"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8747,80 +8507,80 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "contido da mensaxe"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr ""
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "nick"
 msgstr "Alcume"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Non se achou o alcume: %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "password"
 msgstr "Contrasinal: "
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8829,31 +8589,31 @@ msgstr ""
 "'%s' non está na súa listaxe de contactos.\n"
 "Por favor, especifique unha conta para enviar a mensaxe."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8862,7 +8622,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8871,7 +8631,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8880,7 +8640,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Host errado"
@@ -8911,175 +8671,199 @@ msgstr "Non pode eliminar o tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primeiro elixa outro distinto como tema actual."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:163
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:165
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Quer xa non está no grupo de charla \"%s\" quer \"%s\" esta xa non existe."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:435
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:613
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:615
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1224 ../src/gui_interface.py:1045
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1227
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1229
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1232
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1238
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1252
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1268 ../src/groupchat_control.py:1363
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1284 ../src/gui_interface.py:889
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s coñéceselle como %s"
+
+#: ../src/groupchat_control.py:1322 ../src/groupchat_control.py:1326
+#: ../src/groupchat_control.py:1331
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1323
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afiliación:"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1328
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1333
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1412
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1416
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1431
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1435
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1464
 #, python-format
 msgid "%s has left"
 msgstr "%s saíu"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1469
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1471 ../src/gui_interface.py:914
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
+
+#: ../src/groupchat_control.py:1704
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1706
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se pecha esta fiestra, desconectaráselle deste grupo de charla."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1710 ../src/gui_interface.py:1165
+#: ../src/gui_interface.py:1924 ../src/gui_interface.py:1959
+#: ../src/message_window.py:227 ../src/roster_window.py:2659
+#: ../src/roster_window.py:3302 ../src/roster_window.py:3991
+msgid "Do _not ask me again"
+msgstr "_Non me preguntar outra vez"
+
+#: ../src/groupchat_control.py:1743
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1744
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1751
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1752
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifique o novo alcume que quere usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1781
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrición: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1782
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1784
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1965
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1966 ../src/groupchat_control.py:2289
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2288
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
@@ -9104,91 +8888,480 @@ msgid "Details"
 msgstr "Detalles"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:202 ../src/gtkgui_helpers.py:217
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: non se pode abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:393
 msgid "Error reading file:"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:396
 msgid "Error parsing file:"
 msgstr "Erro ao analizar o ficheiro:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:437
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Non se pode escribir en %s. O soporte de manexo de sesión non funcionará"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:806
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:807
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:808
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:874
 msgid "Extension not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:875
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "A imaxe non se puido gardar no formato %(type)s. Desexa gardar como %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:911
 msgid "Save Image as..."
 msgstr "Gardar a imaxe como..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"O seu alcume da súa preferencia está en uso ou rexistrado por outro "
+"ocupante. \n"
+"Por favor, especifique outro alcume abaixo:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Acepta esta solicitude?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Acepta esta solicitude?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Autorización HTTP (%s) para %s (id: %s)"
+
+#: ../src/gui_interface.py:203 ../src/notify.py:519
+msgid "Connection Failed"
+msgstr "Fallou a conexión"
+
+#: ../src/gui_interface.py:542 ../src/gui_interface.py:546
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:556 ../src/gui_interface.py:570
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "produciuse un erro mentres se enviaba %s ( %s )"
+
+#: ../src/gui_interface.py:595 ../src/notify.py:521
+#, fuzzy
+msgid "Subscription request"
+msgstr "Solicitude de subscrición"
+
+#: ../src/gui_interface.py:620
+msgid "Authorization accepted"
+msgstr "Autorización aceptada"
+
+#: ../src/gui_interface.py:621
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "O contacto \"%s\" autorizouno para ver o seu estado."
+
+#: ../src/gui_interface.py:633
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "O contacto \"%s\" eliminou a súa subscrición"
+
+#: ../src/gui_interface.py:634
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:658 ../src/notify.py:523
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Eliminar"
+
+#: ../src/gui_interface.py:699
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
+
+#: ../src/gui_interface.py:981
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1048
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1050
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1056
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1060
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1066
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1098
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "É necesario un contrasinal para entrar a este grupo de charla."
+
+#: ../src/gui_interface.py:1130
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1132 ../src/gui_interface.py:1138
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Está actualmente conectado sen a súa chave de GPG"
+
+#: ../src/gui_interface.py:1133
+msgid "Your passphrase is incorrect"
+msgstr "O contrasinal é incorrecto"
+
+#: ../src/gui_interface.py:1137
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "O contrasinal é incorrecto"
+
+#: ../src/gui_interface.py:1163
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1163
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1175
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:1283
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Hai un correo novo en %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1285
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Ten %d nova conversa de correo"
+msgstr[1] "Ten %d novas conversas de correo"
+
+#: ../src/gui_interface.py:1298
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1366
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s quere enviarlle un ficheiro."
+
+#: ../src/gui_interface.py:1403 ../src/roster_window.py:1813
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Elimina o contacto da listaxe"
+
+#: ../src/gui_interface.py:1405 ../src/roster_window.py:1815
+#, fuzzy
+msgid "Error opening file"
+msgstr "Erro ao ler o ficheiro:"
+
+#: ../src/gui_interface.py:1436
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Recibiu con éxito o ficheiro %(filename)s de %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1440
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
+
+#: ../src/gui_interface.py:1453
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Envioulle con éxito o ficheiro %(filename)s a %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1457
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Detívose a transferencia de %(filename)s a %(name)s."
+
+#: ../src/gui_interface.py:1562
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1569
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "En cada _mensaxe"
+
+#: ../src/gui_interface.py:1643
+msgid "Username Conflict"
+msgstr "Conflito co nome de usuario"
+
+#: ../src/gui_interface.py:1644
+msgid "Please type a new username for your local account"
+msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
+
+#: ../src/gui_interface.py:1656
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1669
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1680
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1707
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Conflito co nome de usuario"
+
+#: ../src/gui_interface.py:1708
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1755
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s quere enviarlle un ficheiro."
+
+#: ../src/gui_interface.py:1758
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Solicitude de transferencia de ficheiro"
+
+#: ../src/gui_interface.py:1863
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1864
+#, 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 ""
+
+#: ../src/gui_interface.py:1869
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1889
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1890
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1920 ../src/gui_interface.py:1955
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Conexión"
+
+#: ../src/gui_interface.py:1921
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+
+#: ../src/gui_interface.py:1923 ../src/gui_interface.py:1958
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1956
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1976
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1977
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2531 ../src/gui_interface.py:2553
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Cifrado desactivado"
+
+#: ../src/gui_interface.py:2532
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2554
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2582 ../src/roster_window.py:3442
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2949
+msgid "Could not save your settings and preferences"
+msgstr "Non se poden gardar as preferencias"
+
+#: ../src/gui_interface.py:3441
+msgid "Passphrase Required"
+msgstr "É necesario o contrasinal"
+
+#: ../src/gui_interface.py:3442
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Introduza o contrasinal GPG para a conta %s"
+
+#: ../src/gui_interface.py:3456
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3457
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Conectarase a %s sen o OpenPGP"
+
+#. ask again
+#: ../src/gui_interface.py:3466
+msgid "Wrong Passphrase"
+msgstr "O contrasinal é incorrecto"
+
+#: ../src/gui_interface.py:3467
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Contactos"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Alcume"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9196,7 +9369,7 @@ msgstr ""
 "Quere limpar a base de datos? (TOTALMENTE DESACONSELLADO SE GAJIM ESTÁ EN "
 "EXECUCIÓN)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 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 "
@@ -9210,16 +9383,16 @@ msgstr ""
 "\n"
 "Caso de elixir SI, por favor, agarde..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "A exportar o historial..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dixo: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:572
 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] ""
@@ -9227,179 +9400,179 @@ msgstr[0] ""
 msgstr[1] ""
 "Está seguro de que quere eliminar o historial dos contactos que seleccionou?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Esta é unha operación irreversíbel"
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 msgstr[1] "Está seguro de que quere eliminar as mensaxes que seleccionou?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historial de conversas con %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambiou o seu estado"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectouse"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectouse"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:277
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:284
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensaxe privada desde o grupo de charlas %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:286
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:289
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:294
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:561
 #, fuzzy
 msgid "Ignore"
 msgstr "nove"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "A recuperar o perfil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2846
 #, fuzzy
 msgid "File is empty"
 msgstr "Camiño do ficheiro"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2849
 #, fuzzy
 msgid "File does not exist"
 msgstr "Non existe o grupo de charla."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2851 ../src/roster_window.py:2862
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Sen unha conexión non pode publicar a súa información de contacto."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "A enviar o perfil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Información NON publicada"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Fallou a publicación da vCard"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9407,46 +9580,51 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1870
 msgid "Authorization has been sent"
 msgstr "Enviouse a autorización"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1871
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1893
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1894
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" acepta esta solicitude, poderá saber o seu estado."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1908
 msgid "Authorization has been removed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1909
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1937
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1938
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Conectarase a %s sen o OpenPGP"
+
+#: ../src/roster_window.py:2147 ../src/roster_window.py:3395
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar nun ou máis grupos de charlas"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3396
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9454,28 +9632,28 @@ msgstr ""
 "Ao cambiar o seu estado a invisíbel provocará a súa desconexión dos grupos "
 "de charla. Está seguro de que quere ser invisíbel?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2174
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2235
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2236
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2237
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2332 ../src/roster_window.py:2577
 msgid "You have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2333
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9484,16 +9662,16 @@ msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2578
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2581
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2582
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9501,11 +9679,11 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2585
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2590
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9514,69 +9692,69 @@ msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: "
 "%s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2654
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2656
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2742
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2743
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2750
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2751
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2792
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2793
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Quere eliminar o grupo %s da listaxe?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2794
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Eliminar da listaxe tamén todos os contactos dentro do grupo"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2833
 msgid "Assign OpenPGP Key"
 msgstr "Asignar chave de OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2834
 msgid "Select a key to apply to the contact"
 msgstr "Seleccione unha chave para lle aplicar ao contacto"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3211
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3213
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3218
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9585,12 +9763,12 @@ msgstr ""
 "ela sempre o/a verá desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3224
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3227
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9598,16 +9776,16 @@ msgstr ""
 "Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
 "sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3230
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto coñeza o meu estado despois da eliminación"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3234
 msgid "Contacts will be removed from your roster"
 msgstr "Os contactos eliminaranse da súa listaxe"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3239
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9617,32 +9795,32 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3296
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3298
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3317
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3318
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3898
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3900
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9651,12 +9829,12 @@ msgstr ""
 "O seu servidor non admite almacenar información de metacontactos. Por tanto, "
 "toda a información referente non se gardará na próxima reconexión."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3985
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3987
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9667,24 +9845,24 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4102
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4113
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s quere enviarlle un ficheiro:"
 msgstr[1] "%s quere enviarlle un ficheiro:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4228
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4234
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Facer %s e %s metacontactos"
@@ -9694,164 +9872,164 @@ msgstr "Facer %s e %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4719 ../src/roster_window.py:4790
+#: ../src/roster_window.py:4799 ../src/statusicon.py:245
+#: ../src/statusicon.py:292 ../src/statusicon.py:298
 #, python-format
 msgid "using account %s"
 msgstr "a usar a conta %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4806
 #, python-format
 msgid "to %s account"
 msgstr "á conta %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4811
 #, python-format
 msgid "using %s account"
 msgstr "a usar a conta %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4848 ../src/statusicon.py:308
 msgid "_Manage Bookmarks..."
 msgstr "Xestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4868
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4908
 #, python-format
 msgid "for account %s"
 msgstr "para a conta %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4964 ../src/roster_window.py:5062
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4988
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4996
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descubrir os servizos..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5140
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5148 ../src/roster_window.py:5316
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5156
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5160
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5336
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5344
 msgid "Edit _Groups"
 msgstr "Editar os grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5399
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Enviar mensaxe"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5445
 msgid "Execute Command..."
 msgstr "Executar o comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5455
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5463
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5472
 msgid "_Rename"
 msgstr "Renomear"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5533
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto desconectado"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5547
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto desconectado"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5629
 msgid "History Manager"
 msgstr "Historial"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5640
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5807
 msgid "Change Status Message..."
 msgstr "Cambiar a mensaxe de estado..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9861,7 +10039,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9871,119 +10049,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Cambiar a mensaxe de estado..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:322
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s deste grupo de charla"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "Conexión"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Subscrición: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Detido"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servizo non respondeu aínda con información detallada"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9991,30 +10169,30 @@ msgstr ""
 "Este servizo podería non responder con información detallada.\n"
 "Posibelmente é antigo ou está roto"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programas</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10022,7 +10200,7 @@ msgstr ""
 "Este contacto está interesado na información da súa presenza, mais vostede "
 "non o está na súa"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10030,14 +10208,14 @@ msgstr ""
 "Está interesado na información da presenza do contacto, mais el/ela non o "
 "está en vostede"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tanto vostede como o contacto están interesados na información da presenza "
 "do outro"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10045,19 +10223,61 @@ msgstr ""
 "Non está interesado na presenza do contacto e el/ela tampouco o está en "
 "vostede"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Está a agardar a resposta do contacto sobre a súa solicitude de subscrición"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "Mens_axe entrante:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "Mensaxe saínte:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk+"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "falta a dependencia pysqlite2 (tcc python-pysqlite2). A saír..."
+
+#, fuzzy
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "O host que configurou como a opción avanzada ft_override_host_to_send non "
+#~ "é valido e ignorarase."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Non se facilitou a chave de OpenPGP"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Para continuar a enviar e recibir mensaxes, precisa volver conectarse."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Non está conectado ou está invisíbel aos máis. A súa mensaxe non se puido "
+#~ "enviar "
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Esta mensaxe está cifrada]"
+
+#~ msgid "%i days ago"
+#~ msgstr "hai %i días"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Engadir unha _notificación especial"
 
@@ -10345,9 +10565,6 @@ msgstr " recurso con prioridade "
 #~ "lle preguntará máis por unha mensaxe de estado cando mude o seu estado a "
 #~ "ausente; simplemente aplicará a mensaxe predefinida para ausente"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "Ant_es do alcume:"
-
 #~ msgid "Chat"
 #~ msgstr "Charla"
 
diff --git a/po/hr.po b/po/hr.po
index 09fb4347a..b946426b0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,17 +1,17 @@
-# Croatian translation for Gajim.
-# Copyright (C) 2008 anrxc
-# This file is distributed under the same license as the gajim package.
-# Adrian C. <anrxc@sysphere.org>, 2008.
-# Deni B. <baccic@gmail.com>, 2006.
-# Armando V. <synan@rilinux.hr> 2006.
-# Vedran M. <rivanvx@gmail.com> 2006.
-# 
+# Croatian translation for Gajim.
+# Copyright (C) 2008 anrxc
+# This file is distributed under the same license as the gajim package.
+# Adrian C. <anrxc@sysphere.org>, 2006-2009.
+# Deni B. <baccic@gmail.com>, 2006.
+# Armando V. <synan@rilinux.hr> 2006.
+# Vedran M. <rivanvx@gmail.com> 2006.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-19 23:52+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-10-31 20:49+0100\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
 "MIME-Version: 1.0\n"
@@ -96,7 +96,7 @@ msgstr "<b>Molim odaberite poslužitelj</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -107,9 +107,8 @@ msgstr ""
 "SHA1 potpis certifikata:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Koristi autentifikaciju"
+msgstr "Anon_imna autentifikacija"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -283,9 +282,9 @@ msgstr "Izmjeni Osobne Informacije"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -294,9 +293,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Općenito"
 
@@ -355,21 +354,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacije o vama, kako stoji na poslužitelju"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Niti jedan ključ nije odabran"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Ništa"
 
@@ -474,18 +473,16 @@ msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
-msgstr "_Uredi prema statusu"
+msgstr "Ure_di prema statusu"
 
 #: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Korisnički Račun"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Koristi autentifikaciju"
+msgstr "Anonimna autentifikacija"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -496,7 +493,6 @@ msgstr ""
 "nesigurne veze."
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
 msgstr "Sp_oji se prilikom pokretanja Gajima"
 
@@ -525,8 +521,8 @@ msgstr ""
 "Mogli bi ste uzeti u obzir mogućnost izmjene postavki vatrozida."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -540,68 +536,57 @@ msgid "Mer_ge accounts"
 msgstr "_Spoji račune"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Pre_imenuj"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
-msgstr "Šalji keep-alive pakete"
+msgstr "Šalji _keep-alive pakete"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
-msgstr "Sink_roniziraj status računa sa globalnim statusom"
+msgstr "Sinkroni_ziraj status računa sa globalnim statusom"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use G_PG Agent"
-msgstr "Koristi GPG _Agent"
+msgstr "Koristi G_PG Agent"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
-msgstr "Koristi vlastito ime poslužitelja/port"
+msgstr "Koristi vlastit_o ime poslužitelja/port"
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Koristi vlastiti port:"
+msgstr "Koristi vlas_titi port:"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "Izmjeni Osobne Informacije"
+msgstr "_Izmjeni Osobne Informacije..."
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Omogući"
+msgstr "_Omogući"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
 msgstr "_Ime poslužitelja:"
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Uredi..."
+msgstr "_Uredi..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
-msgstr "_Port:"
+msgstr "_Port: "
 
 #: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Upozori prije korištenja nesigurne veze"
 
 #: ../data/glade/accounts_window.glade.h:63
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
-msgstr "koristi HTTP_PROXY varijablu okruženja"
+msgstr "_koristi HTTP__PROXY varijablu okruženja"
 
 #: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
@@ -787,7 +772,7 @@ msgstr "<b>Uvjeti</b>"
 #: ../data/glade/advanced_notifications_window.glade.h:4
 #: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
-msgstr "<b>Zvukovi</b>"
+msgstr "<b>Zvuci</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 msgid "Advanced Actions"
@@ -949,7 +934,7 @@ msgstr "Posljednja izmjena:"
 msgid "New entry received"
 msgstr "Primljen novi unos"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Primili ste novi unos:"
 
@@ -993,11 +978,11 @@ msgstr "Unesite novu lozinku:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Upišite vašu novu statusnu poruku</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Aktivnost:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Raspoloženje:"
 
@@ -1077,9 +1062,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Pridruži Open_PGP Ključ..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Izvrši Naredbu..."
+msgstr "I_zvrši Naredbu..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1087,8 +1071,8 @@ msgstr "Uredi _Grupe..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
@@ -1101,8 +1085,8 @@ msgid "Remo_ve"
 msgstr "Uklo_ni"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Postavi Prila_gođeni Status"
 
@@ -1135,8 +1119,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli njemu/njoj da vidi moj status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Blokiraj"
 
@@ -1147,7 +1131,7 @@ msgstr "_Zabrani mu/joj da vidi moj status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Povijest razgovora"
 
@@ -1168,8 +1152,8 @@ msgid "_Subscription"
 msgstr "_Pretplata"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
@@ -1258,7 +1242,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Prikaži obavijest kada završi prijenos datoteka"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Nastaviti"
 
@@ -1266,7 +1250,7 @@ msgstr "_Nastaviti"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Obavijesti me kada se završi prijenos datoteka"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Otvaranje Mape Sadržaja"
 
@@ -1294,7 +1278,7 @@ msgstr ""
 "Red Kontakt\n"
 "Baner Razgovora"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Podebljano"
 
@@ -1314,11 +1298,11 @@ msgstr "Personalizacija Gajim Tema"
 msgid "Gone"
 msgstr "Otišao"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Ukošeno"
 
@@ -1366,7 +1350,7 @@ msgstr "Promijeni _Temu..."
 msgid "Configure _Room..."
 msgstr "Podešavanje _Sobe..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Postavi Oznaku"
 
@@ -1455,8 +1439,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Dobrodošli u Gajim Upravitelj Zapisima</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Obriši"
 
@@ -1487,7 +1472,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Pretraži Bazu Podataka"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Povijest razgovora"
 
@@ -1511,11 +1496,10 @@ msgid "_Log conversation history"
 msgstr "_Pamti povijest razgovora"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "Postavi knjižnu oznaku za sobu (Ctrl+B)"
+msgstr "Postavi knjižnu oznaku za sobu"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
@@ -1542,8 +1526,8 @@ msgstr "Nedavno:"
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Pridruživanje"
 
@@ -1572,7 +1556,7 @@ msgstr "Minimiziraj kod Automatskog Ulaska"
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Poslužitelj:"
 
@@ -1601,14 +1585,14 @@ msgid "<b>Settings</b>"
 msgstr "<b>Postavke</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
 msgstr ""
 "HTTP Spoj\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1619,34 +1603,28 @@ msgid "Pass_word:"
 msgstr "Lo_zinka:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgstr "Proxy _Računalo:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-#, fuzzy
 msgid "Use HTTP prox_y"
-msgstr "_Koristi proxy"
+msgstr "Koristi HTTP prox_y"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Koristi autentifikaciju"
+msgstr "Koristi proxy aut_entifikaciju"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
-#, fuzzy
 msgid "_BOSH URL:"
-msgstr "_URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Vrsta:"
+msgstr "_Vrsta:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
@@ -1685,22 +1663,30 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Prikaži popis emoticona (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
-#, fuzzy
 msgid "Show a list of formattings"
-msgstr "Prikaži popis emoticona (Alt+M)"
+msgstr "Prikaži popis formata"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Prikaži izbornik naprednih mogućnosti (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Prikaži profil kontakta (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Pošalji"
 
@@ -1797,7 +1783,7 @@ msgstr "Dozvoli obavijesti kada sam _odsutan/nedostupan/zauzet/nevidljiv"
 
 #: ../data/glade/preferences_window.glade.h:26
 msgid "Allow sound when I'm _busy"
-msgstr ""
+msgstr "Dozvoli zvuk kada sam _zauzet"
 
 #: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
@@ -1830,6 +1816,16 @@ msgid "Configure color and font of the interface"
 msgstr "Postavi boje i font sučelja"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Poruka:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Ime kontakta"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1843,31 +1839,31 @@ msgstr ""
 "Odvojena lista sa razgovorima grupiranim po računu\n"
 "Odvojena lista sa razgovorima grupiranim po vrsti"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Prikaži _aktivnost kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Prikaži dodatne email _detalje"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Prikaži _glazbu kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Prikaži a_vatare kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Prikaži _raspoloženje kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne _poruke kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1877,7 +1873,7 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se prikazati u "
 "prozorima razgovora."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1887,7 +1883,7 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati "
 "drugoj osobi."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1895,11 +1891,11 @@ msgstr ""
 "Gajim će vas obavijestiti o kontaktima koji su se upravo odjavili sa malim "
 "prozorom u donjem desnom kutu ekrana"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Sakrij dugmad u prozoru razgovora."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1907,21 +1903,21 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Ako je označeno, Gajim će ujedno uključiti i informacije o pošiljatelju"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ako je označeno, Gajim će promjeniti status u Odsutan kad se računalo ne "
 "koristi."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1929,7 +1925,7 @@ msgstr ""
 "Ako je označeno, Gajim će promjeniti status u Nedostupan kad se računalo ne "
 "koristi još duže."
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1937,7 +1933,7 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1945,23 +1941,23 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "Ako je označeno, Gajim će prikazivati aktivnost kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Ako je označeno, Gajim će prikazivati raspoloženje kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ako je označeno, Gajim će prikazivati glazbu koju slušaju kontakti na listi"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1972,7 +1968,7 @@ msgstr ""
 "desnim klikom miša na polje za unos teksta, zadani jezik će se koristiti za "
 "dani kontakt ili grupni razgovor."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1982,7 +1978,7 @@ msgstr ""
 "vaše liste. Koristite sa oprezom, blokira sve poruke koje dolaze od ljudi "
 "van vaše liste kontakata"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1992,7 +1988,7 @@ msgstr ""
 "da se kod E2E enkripcije druga strana mora složiti s time, inače poruke neće "
 "biti zapisane."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2000,7 +1996,7 @@ msgstr ""
 "Ako je označeno, Gajim će obavještavati o novim e-mail porukama primljenim "
 "preko GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2009,7 +2005,7 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
 "(npr. kontakt sa MSN-a će imati msn statusne ikone)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2017,7 +2013,7 @@ msgstr ""
 "Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
 "odabrana predefinirana poruka."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2025,50 +2021,53 @@ msgstr ""
 "Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa "
 "ekvivalentnim animiranim ili statičnim grafičkim emotikonama"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Spremaj _kriptirane razgovore"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Na_pravi prozore sa razgovorom kompaktnim"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Izmje_ni..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Nikad\n"
+"Samo kod događaja na čekanju\n"
+"Uvijek"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Obavijesti"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavijesti me o kontaktima koji se _prijave"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavijesti me o kontaktima koji se _odjave"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Obavijesti o novoj _Gmail e-pošti"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Osobni Događaji"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Dozvoli _zvukove"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2078,24 +2077,23 @@ msgstr ""
 "Obavijesti me o njima\n"
 "Prikaži samo na listi korisnika"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
-msgstr "_Prikaži događaj u traci radne površine"
+msgstr "Prikaži ikonu u traci radne površine:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Prijavim"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Odjavim"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2103,28 +2101,27 @@ msgstr ""
 "Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.) Ako je "
 "označeno, Gajim će prikazati samo čisti tekst poruke."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Sortiranje kontakata po statusu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Statusne _ikone:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Izgled"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2132,10 +2129,11 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 "Statusna poruka kod automatske odsutnosti. Ukoliko je prazno Gajim neće "
-"promjeniti trenutnu statusnu poruku"
+"promjeniti trenutnu statusnu poruku\n"
+"$S će biti zamjenjen sa prijašnjom porukom$T će biti zamjenjen sa auto-away "
+"vremenskim ograničenjem"
 
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2143,105 +2141,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Statusna poruka kod automatske nedostupnosti. Ukoliko je prazno Gajim neće "
-"promjeniti trenutnu statusnu poruku"
+"promjeniti trenutnu statusnu poruku\n"
+"$S će biti zamjenjen sa prijašnjom porukom\n"
+"$T će biti zamjenjen sa auto-not-available vremenskim ograničenjem"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Različite _ikone za prijenose"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Definirano _sustavom"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Kod novih događaja:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Poruka Greške: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Nadimak:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "_Odsutan automatski nakon:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Preglednik:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "_Prikaži obavijesti o statusu razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Emotikoni:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Upravitelj datotekama:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Istakni pogrešno napisane riječi"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriraj događaje od kontakata koji nisu na listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoriraj bogati sadržaj u dolaznim porukama"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Dolazna poruka:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Pamti promjene statusa kontakata"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Mail klijent:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "_Nedostupan automatski nakon:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Odlazna poruka:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Vrati predefinirane boje"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "_Šalji obavijesti o statusu razgovora"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "_URL isticanje:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Ponašanje Prozora"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "na _listi"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minuta"
 
@@ -2274,9 +2276,8 @@ msgid "All"
 msgstr "Svi"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "sve prema pretplati"
+msgstr "Sve (uključujući pretplatu)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2294,7 +2295,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Lista Privatnosti"
 
@@ -2438,7 +2439,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Uloga:</b>"
 
@@ -2498,8 +2499,8 @@ msgstr "Ukloni račun iz Gajima i sa po_služitelja"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -2508,24 +2509,24 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>netko@negdje.com</b> želi da <b>dodate</b> neke kontakte na vašu listu."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Tijelo Poruke <trenutno neiskorišteno, pa je skriveno>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Razmjena Artikla Sa Liste Kontakata"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_Uredu"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-close"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2552,9 +2553,8 @@ msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Prikaži _Odspojene Kontakte"
+msgstr "Prikaži Samo _Aktivne Kontakte"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2583,7 +2583,7 @@ msgstr "_Akcije"
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Uredi"
 
@@ -2624,11 +2624,11 @@ msgid "_Add contact"
 msgstr "_Dodaj kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Informacije"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Pretraga"
 
@@ -2648,10 +2648,6 @@ msgstr "Registriraj na"
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_Uredu"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2756,9 +2752,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Klijent:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>Država:</b>"
+msgstr "<b>Vrijeme kontakta:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
@@ -2857,284 +2852,265 @@ msgstr "Resurs"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Otkaži potvrdu"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Izvršavanje naredbe u tijeku. Zaista želite odustati?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Servis je poslao neispravne podatke"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Servis je promjenio identifikator sesije."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Servis je odgovorio sa greškom."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktivno"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Neaktivno"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Cijeli broj"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Ime Postavke"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Vrijednost"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Vrsta"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Nema)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Skrivena"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Primili ste novi unos:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Primili ste nove unose (i %(count)d nije prikazano):"
+msgstr[1] "Primili ste nove unose (i %(count)d nije prikazano):"
+msgstr[2] "Primili ste nove unose (i %(count)d nije prikazano):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Engleski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Bjeloruski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretonski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Njemački"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Britanski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Španjolski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Talijanski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Nizozemski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brazilski Portugalski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Švedski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Jezik pravopisa"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslana dok niste spojeni."
 
-#: ../src/chat_control.py:820
-#, fuzzy
+#: ../src/chat_control.py:861
 msgid "Underline"
-msgstr "Neodređen"
+msgstr "Podcrtaj"
 
-#: ../src/chat_control.py:821
-#, fuzzy
+#: ../src/chat_control.py:862
 msgid "Strike"
-msgstr "Bolestan"
+msgstr "Precrtaj"
 
-#: ../src/chat_control.py:844
-#, fuzzy
+#: ../src/chat_control.py:885
 msgid "Font"
-msgstr "_Font:"
+msgstr "Font"
 
-#: ../src/chat_control.py:853
-#, fuzzy
+#: ../src/chat_control.py:894
 msgid "Clear formating"
-msgstr "Informacije Kontakta"
+msgstr "Očisti oblikovanje"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Zaista pošalji datoteku?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ako pošaljete datoteku osobi %s, on/ona će znati vaš pravi Jabber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Nije na Listi Kontakata"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "Lista aktivnih, kompletiranih i zaustavljenih prijenosa datoteka"
+msgstr "Ovaj kontakt ne podržava prijenosa datoteka."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr ""
+msgstr "Trebate znati pravi JID kontakta za slanje datoteke."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Nepoznat Izvođač"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Nepoznat Naslov"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Nepoznat Izvor"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
-"šalje <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s iz grupnog razgovora %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "GPG ključ nije dodjeljen"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3142,50 +3118,50 @@ msgstr ""
 "Niti jedan GPG ključ nije dodjeljen ovom kontaktu. Nije moguće kriptirati "
 "poruke sa GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti sačuvana"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti sačuvana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "i autentičan"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
 msgstr "i NIJE autentičan"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3194,48 +3170,48 @@ msgstr ""
 "%(type)s enkripcija %(status)s aktivna %(authenticated)s.\n"
 "Vaš razgovor %(logged)s biti zapisan."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Pregovaranje o sesiji neuspješno"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Ova razgovor je kriptiran"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr "i biti ĆE sačuvana"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti sačuvana"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Identitet druge strane nije potvrđen. Kliknite na ikonu štita za detalje."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Ova poruka NIJE kriptirana"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Ova poruka je kriptirana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3243,15 +3219,15 @@ msgstr ""
 "Ako zatvorite ovu karticu, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Pogreška Baze Podataka"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3260,7 +3236,7 @@ msgstr ""
 "Datoteku baze podataka (%s) nije moguće pročitati. Pokušajte je popraviti "
 "ili obrisati (svi zapisi razgovora će biti izgubljeni)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je trenutno %(status)s"
@@ -3269,23 +3245,23 @@ msgstr "%(name)s je trenutno %(status)s"
 msgid "creating logs database"
 msgstr "kreiram bazu zabilješki"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je datoteka ali bi trebao biti direktorij"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim će se sad isključiti"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je direktorij ali bi trebao biti datoteka"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram %s direktorij"
@@ -3348,10 +3324,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Izaberite grupne razgovore koje želite napustiti"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Grupni Razgovori"
 
@@ -3369,7 +3345,7 @@ msgstr "Sve nepročitane poruke su proslijeđene."
 
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Odsviraj zvuk kad je korisnik zauzet"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3377,7 +3353,7 @@ msgstr "Koristi DBus i Notification-Daemon za prikazivanje obavijesti"
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+msgstr "Prikaži samo dostupne i slobodne kontakte na listi."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3412,51 +3388,48 @@ msgstr ""
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
+"Kada prikazati ikonu u traci radne površine. Može biti 'never', 'on_event', "
+"'always'."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Neispravan nadimak"
+msgstr "Boja dolaznog nadimka."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Boja odlaznog nadimka."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Boja dolaznog teksta."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Boja odlaznog teksta."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "tekst statusne poruke"
+msgstr "Boja teksta statusne poruke."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Neispravan nadimak"
+msgstr "Font dolaznog nadimka."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Mijenjam Nadimak"
+msgstr "Boja odlaznog nadimka."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Font dolaznog teksta."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Font odlaznog teksta."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "tekst statusne poruke"
+msgstr "Font teksta statusne poruke."
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3464,9 +3437,9 @@ msgid ""
 msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "predefinirano"
 
@@ -3521,8 +3494,8 @@ msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"Znak za dodavanje nakon nadimka pri korištenju završavanja nadimka (tipka "
-"tab) u grupnom razgovoru"
+"Znak za dodavanje nakon nadimka pri korištenju dopune nadimka (tipka tab) u "
+"grupnom razgovoru"
 
 #: ../src/common/config.py:131
 msgid ""
@@ -3570,16 +3543,22 @@ msgstr "Koliko minuta trebaju trajati linije iz prošlog razgovora."
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
 msgstr ""
+"Koliko linija teksta zatražiti od poslužitelja kod pridruživanja grupnom "
+"razgovoru."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr ""
+"Koliko minuta prijašnjeg razgovora zatražiti kod pridruživanja grupnom "
+"razgovoru."
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Koliko sekundi čekati za ponovni pokušaj pridruživanja konferenciji sa koje "
+"ste isključeni. Postavite na 0 da bi onemogućili automatsko pridruživanje."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3665,6 +3644,9 @@ 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 ""
+"Pitaj prije zatvaranja prozora za razgovor koji ima kartice, ako postoje "
+"neki koji mogu izgubiti podatke (razgovor, privatni razgovor, grupni "
+"razgovor koji neće biti minimizirani)"
 
 #: ../src/common/config.py:192
 msgid ""
@@ -3906,22 +3888,20 @@ msgstr ""
 "niz znači da nikada ne prikazujemo upit."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
-"niz znači da nikada ne prikazujemo upit."
+"Treba li prikazati upit za potvrdu blokiranja kontakata ili ne? Prazan niz "
+"znači da nikada ne prikazujemo upit."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
-"niz znači da nikada ne prikazujemo upit."
+"Treba li prikazati upit za potvrdu osobnog statusa ili ne? Prazan niz znači "
+"da nikada ne prikazujemo upit."
 
 #: ../src/common/config.py:259
 msgid ""
@@ -3943,13 +3923,12 @@ msgstr ""
 "pohranio lozinke računa."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Ako je Aktivno, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
-"pohranio lozinke računa."
+"Ako je Aktivno, Gajim će koristiti KDE Wallet (ako je kwalletcli dostupan) "
+"da bi pohranio lozinke računa."
 
 #: ../src/common/config.py:262
 msgid ""
@@ -4017,29 +3996,34 @@ msgstr ""
 "Veća je viša."
 
 #: ../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)"
 msgstr ""
 "Ispravne uri sheme. Samo sheme u ovoj listi će biti prihvaćene kao \"pravi\" "
-"uri."
+"uri. (mailto i xmpp se obrađuju posebno)"
 
 #: ../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 ""
+"Zatraži statusnu poruku odspojenih kontakata nakon spajanja na osobni račun. "
+"UPOZORENJE: To će uzrokovati mnogo poslanih zahtjeva!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Ako je Aktivno, automatska dopuna u grupnim razgovorima će biti poput "
+"automatske dopune u sistemskoj ljusci"
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"Kada prikazati red osobnih kontakata. Može biti \"always\", "
+"\"when_other_resource\" ili \"never\""
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4065,13 +4049,14 @@ msgstr "Ako je označeno, vraća zadnji korišteni status."
 #: ../src/common/config.py:297
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
-msgstr ""
+msgstr "Ako je Aktivno, Autorizacija kontakata će biti obavljena automatski."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
-msgstr "Ako je Neaktivno, nećete više vidjeti avatar u prozoru razgovora."
+msgstr ""
+"Ako je Neaktivno, ovaj račun će biti neaktivan i neće biti prikazan na listi "
+"kontakata."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4114,19 +4099,18 @@ msgstr "Popis ssl grešaka koje će se ignorirati, odjeljene razmakom."
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Razmak poslan nakon neaktivnosti"
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "XMPP ping poslan nakon neaktivnosti"
 
 #: ../src/common/config.py:323
-#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
-"Koliko sekundi čekati odgovor keepalive paketa prije nego pokušamo ponovno "
+"Koliko sekundi čekati odgovor ping alive paketa prije nego pokušamo ponovno "
 "spajanje."
 
 #. yes, no, ask
@@ -4134,7 +4118,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4142,15 +4126,15 @@ msgstr ""
 "Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran "
 "u file_transfer_proxies opcijama za prijenos."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtjev za potvrdom o primitku"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Šalji potvrde o primitku"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4158,11 +4142,11 @@ msgstr ""
 "Prilikom pregovaranja o kriptiranoj sesiji, treba li Gajim pretpostaviti da "
 "želite zapisati vaš razgovor?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je li OpenPGP omogućen za ovog kontakta?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4170,101 +4154,101 @@ msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju sa ovim kontaktom, ako "
 "je to moguće?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', ili 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ili ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite mi poruku."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Radim"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Vani"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Vani uživam život."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Ne uznemiravaj."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4273,99 +4257,98 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
 "nadimak."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitati modul idle"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Krivi domaćin"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Neispravna lokalna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registracijske informacije za transport %s nisu došle na vrijeme"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
-msgstr "Registrirati se na %s"
+msgstr "Registracija uspijela"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Registracija sa agentom %s je uspjela"
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
-msgstr "Veza Prekinuta"
+msgstr "Registracija nije uspijela"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
+"Registracija sa agentom %(agent)s nije uspjela, uz poruku o grešci %(error)"
+"s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Račun %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Neispravan Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
+msgstr "Primljena poruka nevažećeg JID-a, automatski je ignorirana."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4375,7 +4358,7 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili obrisati (svi "
 "zapisi razgovora će biti izgubljeni)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljeni nadimak: %s "
@@ -4383,76 +4366,76 @@ msgstr "Nedozvoljeni nadimak: %s "
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Maksimalan broj korisnika za %s je dosegnut"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Grupni razgovor %s ne postoji."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora je ograničeno."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Morate koristiti vaš registrirani nadimak u grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Soba je uništena"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se pridružiti ovoj sobi umjesto: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Želio bih te dodati na moju listu kontakata."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada smo pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Zahtjev za ukidanjem pretplate od %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada smo ukinuli pretplatu za %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4590,79 +4573,107 @@ msgstr "Korištenje ključa ne uključuje potpisivanje certifikata"
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Nije moguće poslati poruku na %s, ovaj JID nije ispravan."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Niti je udaljena prisutnost potpisana, niti je dodijeljen ključ."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "Kontaktov ključ (%s) se ne podudara s ključem dodjeljenim u Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Ova poruka je *kriptirana* (Vidi :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tema: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Veza sa računom \"%s\" je izgubljena"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Ponovo se spojite ručno."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Poslužitelj %(name)s je krivo odgovorio na zahtjev za registraciju: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Poslužitelj %s je pružio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Nepravilan odgovor"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Prijenos %(name)s je krivo odgovorio na zahtjev za registraciju: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nije moguća veza sa \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Provjerite svoju vezu ili pokušajte kasnije."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Spremljeno u: %s"
+msgstr "Odgovor poslužitelja: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Veza na proxy nije uspjela"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Neuspješno povezivanje na račun %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Veza sa računom %s je izgubljena. Pokušajte ponovno spajanje."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentičnost certifikata %s bi mogla biti neispravna."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4671,7 +4682,7 @@ msgstr ""
 "\n"
 "SSL Greška: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4680,24 +4691,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Molim vas da provjerite korisničko ime i lozinku za greške."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom brisanja liste privatnosti"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4706,76 +4717,44 @@ msgstr ""
 "Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od vaših "
 "spojenih resursa. Obustavite ju i pokušajte ponovno."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Nije moguće poslati prazne datoteke"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Niti je udaljena prisutnost potpisana, niti je dodijeljen ključ."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Kontaktov ključ (%s) se ne podudara s ključem dodjeljenim u Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Ova poruka je *kriptirana* (Vidi :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Tema: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Poslan kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Pozovi _Kontakte"
+msgstr "Poslani kontakti:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Veza Prekinuta"
+msgstr "Brisanje registracije nije uspijelo"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
+"Brisanje registracije na poslužitelju %(server)s nije uspjelo: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Prijenosi"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Nije na Listi Kontakata"
 
@@ -4791,7 +4770,7 @@ msgstr "D-Bus mogućnosti Gajima ne mogu se koristiti"
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus trenutno nije ispravno pokrenut na ovom računalu"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -5021,7 +5000,7 @@ msgstr "Slobodan za razgovor"
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Dostupan"
 
@@ -5139,48 +5118,48 @@ msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5188,22 +5167,22 @@ msgstr[0] "%d poruka na čekanju"
 msgstr[1] "%d poruke na čekanju"
 msgstr[2] "%d poruka na čekanju"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr "iz sobe %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr "od korisnika %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5211,7 +5190,7 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaja na čekanju"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5227,652 +5206,673 @@ msgid "%s is not a valid loglevel"
 msgstr "%s nije ispravna razina zapisnika (loglevel)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "greška: nemogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "migriram bazu zabilješki u indekse"
 
 #: ../src/common/passwords.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "računa %s"
+msgstr "XMPP račun %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Ustrašen"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Zapanjen"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Zaljubljen"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Ljut"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Uznemiren"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Zabrinut"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Uzbuđen"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Posramljen"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Dosadno"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Hrabar"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Miran"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Oprezan"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Hladno"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Pouzdan"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Zbunjen"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Razmišlja"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Zadovoljan"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Hirovit"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Lud"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Kreativan"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Znatiželjan"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Bezvoljan"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Depresivan"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Razočaran"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Zgađen"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Zastrašen"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Smeten"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Postiđen"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Zavidan"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Koketan"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustriran"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Zahvalan"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Tuguje"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Zanovijeta"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Kriv"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Sretan"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Pun nade"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Vruć"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Skroman"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Ponižen"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Gladan"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Povrijeđen"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Impresioniran"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Pun strahopoštovanja"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Nezadovoljan"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Zainteresiran"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Pijan"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Nepobjediv"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Usamljen"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Izgubljen"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Sretan"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Podmukao"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Zlovoljan"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Živčan"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutralan"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Uvrijeđen"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Nasilan"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Razigran"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Ponosan"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Opušten"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Umiren"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Sažaljen"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Nemiran"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Tužan"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Zajedljiv"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Zadovoljan"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Ozbiljan"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Šokiran"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Sramežljiv"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Bolestan"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Pod stresom"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Jak"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Iznenađen"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Zahvalan"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Žedan"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Umoran"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Neodređen"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Slab"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Zabrinut"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Radim kućanske poslove"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Kupujem namirnice"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Čistim"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Kuham"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Popravljam"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Perem Suđe"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Perem Rublje"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Uređujem vrt"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Obavljam nešto"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Šetam psa"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Pijem"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Pijem Pivo"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Pijem Kavu"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Pijem Čaj"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Marendam"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Doručkujem"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Večeram"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Ručam"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Vježbam"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Vozim Bicikl"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Plešem"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Planinarim"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Trčim"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Bavim se Sportom"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Trčim"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Skijam"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Plivam"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "U teretani"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Uređujem se"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "U Toplicama"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Perem Zube"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Na Šišanju"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Brijem se"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Kupam se"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Tuširam se"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Na Sastanku sam"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Slobodan Dan"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Družim se"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Skrivam se"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "Na Odmoru"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Molim se"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Planirani Praznik"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Razmišljam"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Opuštam se"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Pecam"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Igram se"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Izlazim"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Na tulumu"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Čitam"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Ponavljam"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Kupujem"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Pušim"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Družim se"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Sunčam se"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Gledam TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Gledam film"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Telefoniram"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "Vani sam"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Koristim Mobitel"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Na Video Konferenciji"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Putujem"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Putujem na posao"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Vozim"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "U Automobilu"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "U Autobusu"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "U Avionu"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "U Vlaku"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "Na Putu"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Pješačim"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Programiram"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "Na Sastanku"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Učim"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Pišem"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Nepoznat Izvođač"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Nepoznat Naslov"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Nepoznat Izvor"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
+"šalje <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5896,38 +5896,11 @@ msgstr ""
 "[Ovo je dio kriptirane poruke. Ukoliko vidite ovu poruku nešto je pošlo po "
 "zlu.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Domaćin %s koji ste postavili kao ft_add_hosts_to_send naprednu opciju nije "
-"ispravan, biti će ignoriran."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Lozinka za OpenPGP nije unešena"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Biti će te spojeni na %s bez OpenPGP-a."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Ako želite nastaviti sa slanjem i primanjem poruka, morati će te se ponovno "
-"spojiti."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5936,52 +5909,44 @@ msgstr ""
 "%s\n"
 "Poruke lokalne veze možda ne rade kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalnu uslugu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemoguće vezanje na port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Molim provjerite da li je avahi-daemon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promjeniti status računa \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Niste spojeni ili ste nevidljivi za druge. Vašu poruku nije moguće poslati."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Ova poruka je kriptirana]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Vašu poruku nije moguće poslati."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je odspojen. Vašu poruku nije moguće poslati."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5993,24 +5958,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja usluge. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Predefinirana Poruka"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6020,216 +5985,213 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Prijaviti se odmah?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promjene odmah primjene, morate se ponovo prijaviti."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
-msgstr "OpenPGP nije moguće koristiti na ovom računalu"
+msgstr "OpenPGP nije upotrebljiv na ovom računalu"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju prije uklanjanja ovog računa."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promjenu imena računa morate se odspojiti."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da bi ste mogli promjeniti ime računa, morate pročitati sve čekajuće događaje"
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Ime Računa Već Upotrebljeno"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Ovo ime već koristi vaš drugi račun. Molim odaberite drugo ime."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Neispravno ime računa"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Ime računa ne može biti prazno."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Preimenuj Račun"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za račun %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Neuspješno dohvaćanje tajnih ključeva"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "Došlo je do problema pri dohvaćanju vaših OpenPGP tajnih ključeva."
+msgstr "OpenPGP tajni ključ nije dostupan."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez veze sa poslužiteljom nije moguća izmjena osobnih informacija."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš poslužitelj ne podržava Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Vaš poslužitelj nije u mogućnosti spremiti vaše osobne informacije."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "Za promjenu imena računa morate se odspojiti."
+msgstr "Za deaktivaciju računa morate biti odspojeni."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Račun Lokalno već postoji."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Molim uklonite ili preimenujte prije omogućivanja poruka lokalne veze."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Ban Lista"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Lista Članova"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Lista Vasnika"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Lista Administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Zabranjivanje..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6237,11 +6199,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Dodaja Člana..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6249,11 +6211,11 @@ msgstr ""
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6261,11 +6223,11 @@ msgstr ""
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6273,8 +6235,7 @@ msgstr ""
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6288,60 +6249,61 @@ msgstr ""
 "2. korisnik@domena (bilo koji resurs se poklapa).\n"
 "3. domena/resurs (poklapa se samo sa tim resursom).\n"
 "4. domena (sama domena se poklapa, kao i bilo koji korisnik@domena,\n"
-"domena/resurs, ili adresa koja sadrži poddomenu."
+"domena/resurs, ili adresa koja sadrži poddomenu)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Predefinirano"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?ispis_statusa:Sve"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Samo ulasci i izlasci"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?ispis_statusa:Ništa"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6349,64 +6311,61 @@ msgstr ""
 "oznaku."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Nedozvoljeni nadimak: %s "
+msgstr "Znak nije dozvoljen"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Neispravan poslužitelj"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Neispravan unos"
+msgstr "Neispravna soba"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Napredne opcije računa možete urediti pritiskom na gumb Napredno, ili "
-"kasnije klikom na Korisnički Računi u izborniku Uredi."
+"kasnije klikom na Korisnički Računi u izborniku Uredi glavnog prozora."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi račun je uspješno stvoren"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo specificirajte poslužitelj na koji se želite registrirati."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Certifikat je već na listi"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ovaj certifikat je već u datoteci %s, neće biti ponovno dodan."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6421,7 +6380,7 @@ msgstr ""
 "SSL Greška: %(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6432,63 +6391,63 @@ msgstr ""
 "SHA1 otisak certifikata:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Prva Poruka Primljena"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Sljedeća Poruka Primljena sa Fokusom"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Sljedeća Poruka Primljena bez Fokusa"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt Spojen"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt Odspojen"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Poruka Poslana"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Primljen Gmail Email"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6498,7 +6457,7 @@ msgstr ""
 "primljena sa druge strane. Ukoliko se ova ikona zadrži\n"
 "duže vremena moguće je da je poruka izgubljena."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6506,221 +6465,218 @@ msgstr ""
 "Tekst niže od ove linije je ono što je rečeno od kad ste\n"
 "zadnji puta obraćali pozornost na ovaj grupni razovor"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Izlaz"
+msgstr "_Citat"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u riječnika nedostaje \"%s\" i nije WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Jučer"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "Prije %i dana"
+msgid_plural "%i days ago"
+msgstr[0] "Jučer"
+msgstr[1] "Jučer"
+msgstr[2] "Jučer"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je već na listi"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber ID koji ste unjeli je već na popisu. Izaberite drugi."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "novi@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novi%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "ID ključa"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Postavi Raspoloženje"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna Poruka"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Statusna Poruka"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Prepiši Statusnu Poruku?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ovo ime se već koristi. Želite prepisati ovu statusnu poruku?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Snimiti kao Unaprijed Postavljenu Statusnu Poruku"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Molim unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM Adresa:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN Adresa:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresa:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati za račun %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Neispravan Korisnički ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Nemoguće dodati samog sebe na vlastitu listu."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakt je već na listi"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "ID Korisnika:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klijent"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ Verzija:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK Verzija:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Trenutni Razvojni Programeri:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Prošli Razvojni Programeri:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "ZAHVALE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Zadnje, ali ne najmanje, željeli bismo se zahvaliti svim održavateljima "
 "paketa"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Adrian C. <anrxc@sysphere.org>\n"
@@ -6728,7 +6684,7 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6740,98 +6696,100 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Nadimak sadrži nedozvoljene znakove."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtjev za pretplatu na račun %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se pridružiti grupnom razgovoru ukoliko niste spojeni."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružiti se Grupnom Razgovoru sa računom %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Neispravno ime računa"
+msgstr "Neispravan Račun"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Račun sa kojeg želite ući u sobu"
+msgstr "Morate izabrati račun sa kojeg želite ući u sobu."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Neispravan Nadimak"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Jabber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Ovaj račun nije spojen sa poslužiteljem"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete sinkronizirati sa računom ukoliko nije spojen."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započeti Razgovor sa računom %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6840,302 +6798,327 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molim potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Neispravan JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće učitati \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promjena lozinke."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Morate unesti lozinku."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakt Se Prijavio"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nova Jedna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
-#, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Želio bih Vas dodati na moju listu kontakata."
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Tužan"
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#: ../src/dialogs.py:2958
 #, fuzzy
-msgid "Add"
-msgstr "Adresa:"
+msgid "modify"
+msgstr "Uredi"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#: ../src/dialogs.py:2959
 #, fuzzy
+msgid "remove"
+msgstr "Uklo_ni"
+
+#: ../src/dialogs.py:2987
+#, fuzzy, python-format
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> želi da <b>%s</b> neke kontakte na vašoj listi."
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+msgid "Add"
+msgstr "Dodaj"
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Zlovoljan"
+msgstr "Uredi"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Jabber ID:"
+msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Grupa"
+msgstr "Grupe"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Želio bih te dodati na moju listu kontakata."
+msgstr "%s vas je preporučio za dodavanje na moju listu kontakata."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Dodaj kontakt"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Uklanja kontakt sa liste"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista Privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Redoslijed: %(order)s, akcija: %(action)s, tip: %(type)s, vrijednost: %"
 "(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosljed: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmjena pravila</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste Privatnosti za %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Neispravno Ime Liste"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vas je pozvao da se uključite u raspravu."
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact vas je pozvao na grupni razgovor %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Želite li prihvatiti poziv?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Odabir Zvuka"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
-msgstr "Wav Zvukovi"
+msgstr "Wav Zvuci"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Odabir Slike"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje Posebne Obavijesti za %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Uvjet"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7146,19 +7129,19 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Kontaktov identitet potvrđen"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Potvrdi ponovno..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7168,19 +7151,19 @@ msgstr ""
 "ili slati vama poruke, morate potvrditi njihov identitet klikom na dugme "
 "ispod."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktov identitet NIJE potvrđen"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Jeste li potvrdili kontaktov identitet?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7195,22 +7178,22 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Jeste li razgovarali sa drugom stranom i potvrdili SAS?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktov ključ (%s) <b>se ne podudara</b> sa ključem dodijeljenim u Gajim."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ovaj kontakt nema dodijeljeni GPG ključ. Nije moguće kriptirati poruke."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7219,7 +7202,7 @@ msgstr ""
 "ključu</b>, tako da poruke <b>nemogu</b> biti kriptirane. Promjenite razinu "
 "povjerenja u njegov ključ sa GPG klijentom."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7227,6 +7210,25 @@ msgstr ""
 "GPG ključ je dodijeljen ovom kontaktu, i vi vjerujete njegovom ključu, tako "
 "da će poruke biti kriptirane."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Ostali"
@@ -7236,24 +7238,24 @@ msgstr "Ostali"
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Ukoliko niste spojeni nećete moći pregledati dostupne usluge"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Usluga nije pronađena"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7261,244 +7263,235 @@ msgstr ""
 "Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Uslugu nije moguće pretražiti"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Ovakav tip usluge ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Neispravno Ime Poslužitelja"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pregled %(address)s koristeći račun %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Izvrši Naredbu..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Knjižna oznaka je već postavljena"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Knjižna oznaka je bez uspješno dodana"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem "
 "spisku."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Pretplaćeno"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Pretplatiti se"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
-#: ../src/features_window.py:46
-#, fuzzy
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
-msgstr "Greška SSL certifikata"
+msgstr "Provjera valjanosti SSL certifikata"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Biblioteka koja se koristi za ovjeru certifikata poslužitelja da bi se "
 "osigurala sigurna veza."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Potreban je python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Razgovori bez centralnog poslužitelja sa automatskim otkrivanjem klijenata u "
 "lokalnoj mreži."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Potreban je python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Potreban je pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Komanda: %s"
+msgstr "Naredbena linija"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Skripta koja kontrolira Gajim iz naredbene linije."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Potreban je python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Mogućnost nije dostupna za Windows."
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "OpenPGP Enkripcija"
+msgstr "OpenPGP enkripcija poruka"
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Kriptiranje poruka sa gpg ključevima."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Potrebni su gpg i python-GnuPGInterface."
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
-msgstr "network-manager"
+msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Automatsko otkrivanje mrežnog statusa."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Potreban je gnome-network-manager i python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Upravljanje Sesijama"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesija je sačuvana kod gašenja i povraćena kod pokretanja."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Potreban je python-gnome2."
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Lozinka za ulaz u sobu"
+msgstr "Kriptiranje lozinke"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lozinke se mogu spremati sigurno, ne samo kao običan tekst."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Potrebni su gnome-keyring i python-gnome2-desktop."
+msgstr "Potrebni su gnome-keyring i python-gnome2-desktop, ili kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Mogućnost spajanja na poslužitelje koji koriste SRV spise."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Potreban je dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Potreban je nslookup za korištenje SRV spisa."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Provjera Pravopisa"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Provjera pravopisa napisanih poruka."
 
-#: ../src/features_window.py:80
-#, fuzzy
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
-msgstr "Potreban je python-sexy."
+msgstr "Potreban je libgtkspell."
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
-msgstr "Obavijesti"
+msgstr "Obavijest"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Neaktivni prozori sa obavijestima o novim događajima."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7506,53 +7499,32 @@ msgstr ""
 "Potreban je python-notify ili umjesto toga python-dbus u kombinaciji sa "
 "notification-daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Trayicon"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Ikona u traci radne površine koja odražava trenutni status."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Potreban je python-gnome2-extras ili kompiliran trayicon modul iz Gajim "
-"izvornog koda."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Potreban je PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
-msgstr "_Uredi prema statusu"
+msgstr "Automatski status"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Mogućnost mjerenja vremena neaktivnosti, da bi se postavio automatski status."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
-msgstr ""
+msgstr "Zahtijeva biblioteku libxss."
 
-#: ../src/features_window.py:93
-#, fuzzy
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
-msgstr "Potreban je python-gnome2."
+msgstr "Potreban je python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Pretvara LaTeX izraze između $$ $$ znakova."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7560,7 +7532,7 @@ msgstr ""
 "Potrebni su texlive-latex-base i dvipng. Morate postaviti 'use_latex' na "
 "Aktivno u Naprednom Uređivaču Postavki."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7568,25 +7540,23 @@ msgstr ""
 "Potrebni su texlive-latex-base i dvipng (Sve je u MixTeX). Morate postaviti "
 "'use_latex' na Aktivno u Naprednom Uređivaču Postavki."
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "End to End enkripcija"
+msgstr "End to End kriptiranje poruka"
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Kriptiranje poruka."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Potreban je python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7594,23 +7564,36 @@ msgstr ""
 "Generira XHTML izlaz iz RST koda (pogledati http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Potreban je python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Baneri i poveznice koje reagiraju na klik"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Mogućnost pretvaranja natpisa u zaglavljima prozora u URL linkove."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Potreban je python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Potreban je python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Funkcija"
 
@@ -7626,139 +7609,138 @@ msgstr "Vrijeme"
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "veličina: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošiljatelj: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Primatelj: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Spremljeno u: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Prijenos datoteka završen"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Prijenos datoteka otkazan"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Vezu nije moguće ostvariti."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primatelj: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka Greške: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
-msgstr "Razmjena Datoteka Zaustavljena"
+msgstr "Razmjena datoteka zaustavljena"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Odabir Datoteke za Slanje..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Datoteka sa ovim imenom već postoji i nemate ovlasti prepisati ju."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Å to želite učiniti?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U direktorij \"%s\" nije moguće zapisivati"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Snimiti Datoteku kao..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7766,32 +7748,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Neispravna Datoteka"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Datoteka: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Pošiljatelj: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pauza"
 
@@ -7802,27 +7784,23 @@ msgstr "Gajim treba X poslužitelj za rad. Izlaz..."
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "Učitavanje PyGTK nije uspjelo: %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim treba pyGTK 2.8 ili viši"
+msgstr "Gajim treba PyGTK 2.12 ili viši"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim needs PyGTK 2.8 ili viši za pokretanje. Izlaz..."
+msgstr "Gajim treba PyGTK 2.12 ili viši za pokretanje. Izlaz..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim treba GTK 2.8 ili viši"
+msgstr "Gajim treba GTK 2.12 ili viši"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim treba GTK 2.8 ili viši za pokretanje. Izlaz..."
+msgstr "Gajim treba GTK 2.12 ili viši za pokretanje. Izlaz..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7861,11 +7839,11 @@ msgstr ""
 "na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7873,460 +7851,28 @@ msgstr ""
 "Trenutno je već pokrenuta jedna instanca Gajima\n"
 "Svejedno pokrenuti?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Potrebna Lozinka"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Unesite GPG lozinku za ključ %(keyid)s (račun %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "GPG ključ nije dodjeljen"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Biti će te spojeni na %s bez OpenPGP-a."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Kriva Lozinka"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Vaš željeni nadimak za grupni razgovor %s se trenutno koristi ili je "
-"registriran od strane drugog učesnika.\n"
-"Molimo unesite drugi nadimak ispod:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Prihvaćate li ovaj zahtjev?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Prihvaćate li ovaj zahtjev na računu %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Veza Prekinuta"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Greška %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "greška prilikom slanja %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Zahtjev za Pretplatom"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorizacija prihvaćena"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Uvijek ćete vidjeti njega ili nju kao odspojenu.\n"
-"Želite li ukloniti njega ili nju sa vaše liste kontakata?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Ukinuti pretplatu"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s je trenutno %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s je postavio temu na %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Svakom sudioniku je sada dopušteno da vidi vaš puni JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Soba od sada prikazuje nedostupne članove"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "Soba od sada ne prikazuje nedostupne članove"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Došlo je do non-privacy-related promjene u postavkama sobe"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Soba je sada non-anonymous"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Soba je sada semi-anonymous"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Soba je sada fully-anonymous"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Potrebna je lozinka za pridruživanje grupnom razgovoru %s. Molim unesite je."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Postavili ste Gajim da koristi GPG agent, ali GPG agent nije pokrenut ili je "
-"odgovorio sa krivom lozinkom.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Trenutno ste spojeni bez OpenPGP ključa."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Vaša lozinka nije točna"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Vaša lozinka nije točna"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG nije upotrebljiv"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Ovaj kontakt nema dodijeljeni GPG ključ. Nije moguće kriptirati poruke."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Ne pitaj me više"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring je instaliran, ali nije \t\t\t\t\t\t\tispravno pokrenut "
-"(vjerovatno varijabla okruženja nije \t\t\t\t\t\t\tispravno postavljena)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Novi E-mail na %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Imate %d novi E-mail razgovor"
-msgstr[1] "Imate %d nova E-mail razovora"
-msgstr[2] "Imate %d novih E-mail razgovora"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Od: %(from_address)s\n"
-"Tema: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s vam želi poslati datoteku."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Uklanja kontakt sa liste"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Greška pri čitanju datoteke:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Uspješno ste primili %(filename)s od %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Uspješno ste poslali %(filename)s %(name)s"
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Nemoguće dekriptirati poruke od %s\n"
-"Možda ih je netko izmjenio."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Nemoguće dekriptirati poruku"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Konflikt korisničkog imena"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Molim unesite novo korisničko ime za vaš lokalni račun"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Greška."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Konflikt Resursa"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr "Već ste spojeni na ovaj račun sa istim resursom. Molim unesite novi."
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Greška kod ovjere SSL certifikata"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Došlo je do pogreške kod ovjere SSL certifikata vašeg jabber poslužitelja: %"
-"(error)s\n"
-"Još uvijek se želite povezati na ovaj poslužitelj?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignoriraj ovu grešku za ovaj certifikat."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Greška SSL certifikata"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Čini se da je SSL certifikat promjenjen ili je vaša veza provaljena.\n"
-"Stari otisak: %(old)s\n"
-"Novi otisak: %(new)s\n"
-"\n"
-"Još uvijek se želite povezati i korigirati otisak certifikata?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Nesigurna Veza"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Spremate se poslati vašu lozinku preko nekriptirane veze. Jeste li sigurni "
-"da želite nastaviti?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Da, stvarno želim nesigurno povezivanje"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
-"instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "PEP čvor nije obrisan"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP čvor %(node)s nije obrisan: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Emotikoni onemogućeni"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr "Postavljena tema emotikona nije pronađena, emotikoni su onemogućeni."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Nije moguće učitati postavljenu temu emotikona. Možda morate ažurirati "
-"format emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/"
-"Emoticons za više detalja."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Nije moguće spremanje vaših postavki"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Prikazuje prozor sa sljedećim događajem na čekanju"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8334,51 +7880,51 @@ msgstr ""
 "Ispisuje listu svih kontakata na listi. Svaki kontakt pojavljuje se u "
 "odvojenoj liniji"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "račun"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "prikaži samo kontakte ovog računa"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registriranih računa"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Mjenja status jednog računa ili više njih"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, ne "
 "uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "poruka"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8387,48 +7933,43 @@ msgstr ""
 "statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Mjenja status jednog računa ili više njih"
+msgstr "Mjenja status jednog ili više računa"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Priori_tet:"
+msgstr "prioritet"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Želim se _registrirati novi račun"
+msgstr "prioritet koji želite dodjeliti računu"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"izmjena statusa računa \"račun\". Ako nije određeno, pokušaj promjene "
-"statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
-"statusom\""
+"izmjena prioriteta danog računa. Ako nije određeno, promjena statusa svih "
+"računa koji imaju postavljenu opciju \"sinkronizacija sa globalnim statusom\""
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Prikazuje dialog razgovora kako bi mogli slati poruke kontaktu"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontakta sa kojim želite razgovarati"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je označeno, kontak se uzima sa kontakt liste ovog računa"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "sadržaj poruke. Korisnički račun mora biti naveden ili \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8438,29 +7979,29 @@ msgstr ""
 "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo postavite "
 "'OpenPGP ključ' kao ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp ključ"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je označeno, poruka će biti kriptirana koristeći ovaj javni ključ"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je označeno, poruka će biti poslana koristeći ovaj račun"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8470,134 +8011,134 @@ msgstr ""
 "želite postaviti samo 'račun', bez 'OpenPGP ključa', postavite 'OpenPGP "
 "ključ' kao ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku grupnom razgovoru kojem ste pristupili."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontakta"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o računu"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Ime računa"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Putanja datoteke"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "ako je označeno, datoteka će biti poslana koriteći ovaj račun"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Prikatuje sve postavke i njihove vrijednosti"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ključ=vrijednost"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime postavke, 'vrijednost' je vrijednost na koju će se postaviti"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Briše element postavke"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "ime postavke koja će se brisati"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Dodaje novi kontakt ovom računu"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ukoliko nije određen račun)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ukoliko nije određen račun)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvaranje dialoga 'Započeti Razgovor'"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj račun"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Šalje korisnički XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8605,72 +8146,71 @@ msgstr ""
 "Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
 "na sve račune"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Rukuj xmpp:/ adresama"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI za obraditi"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Račun sa kojim želite obraditi"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "sadržaj poruke"
+msgstr "Sadržaj poruke"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Pridruživanje Novoj Sobi"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "JID Sobe"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Nadimak koji će se koristiti"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Lozinka za ulaz u sobu"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Račun sa kojeg želite ući u sobu"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Provjerite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8679,15 +8219,15 @@ msgstr ""
 "'%s' nije na vašoj listi.\n"
 "Molim odredite račun za slanje poruke."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim nije pokrenut. Nije moguće koristiti gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8696,16 +8236,16 @@ msgstr ""
 "Uporaba: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8714,7 +8254,7 @@ msgstr ""
 "Uporaba: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8723,7 +8263,7 @@ msgstr ""
 "Previše argumenata. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8732,7 +8272,7 @@ msgstr ""
 "Argument \"%(arg)s\" nije određen. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Krivi uri"
 
@@ -8761,152 +8301,176 @@ msgstr "Ne možete izbrisati svoju trenutnu temu"
 msgid "Please first choose another for your current theme."
 msgstr "Molim prvo odaberite neku drugu temu za trenutnu."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Više niste u grupnom razgovoru \"%(room)s\" ili je \"%(nick)s\" otišao."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Razgovor sa"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Svakom sudioniku je sada dopušteno da vidi vaš puni JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Zapisivanje razgovora u sobi je omogućeno"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Nova soba je stvorena"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Poslužitelj je dodijelio ili promjenio vaš nadimak"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup od strane %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "pripadnost promjenjena"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe promjenjena na members-only"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "zaustavljanje sustava"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Pripadnost %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Pripadnost %(nick)s je postavljena na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je trenutno %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, biti ćete odspojeni iz ovog grupnog razgovora."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Ne pitaj me više"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Molim specificirajte novu temu:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molim specificirajte novi nadimak ako ga želite koristiti:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8914,22 +8478,22 @@ msgstr ""
 "Definitivno će te uništiti ovu sobu.\n"
 "Ispod možete navesti razlog:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
@@ -8954,58 +8518,469 @@ msgid "Details"
 msgstr "Detalji"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Greška pri učitavanju datoteke:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nije moguće pisati u %s. Rukovanje sesijama neće biti moguće"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije zadani Jabber klijent"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Želite li postaviti Gajim za zadani Jabber klijent?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Uvijek provjeri ako je Gajim zadani Jabber klijent, pri pokretanju"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Produžetak nije podržan"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Sliku nije moguće spremiti u %(type)s formatu. Spremiti kao %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Snimiti Sliku kao..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Vaš željeni nadimak za grupni razgovor %s se trenutno koristi ili je "
+"registriran od strane drugog učesnika.\n"
+"Molimo unesite drugi nadimak ispod:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "U slučaju konflikta uvijek koristi ovaj nadimak"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Prihvaćate li ovaj zahtjev?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Prihvaćate li ovaj zahtjev na računu %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Veza Prekinuta"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Greška %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "greška prilikom slanja %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Zahtjev za pretplatom"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorizacija prihvaćena"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Uvijek ćete vidjeti njega ili nju kao odspojenu.\n"
+"Želite li ukloniti njega ili nju sa vaše liste kontakata?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Pretplata uklonjena"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s je postavio temu na %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Soba od sada prikazuje nedostupne članove"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "Soba od sada ne prikazuje nedostupne članove"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "Došlo je do non-privacy-related promjene u postavkama sobe"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Soba je sada non-anonymous"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Soba je sada semi-anonymous"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Soba je sada fully-anonymous"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
+"Potrebna je lozinka za pridruživanje grupnom razgovoru %s. Molim unesite je."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Postavili ste Gajim da koristi GPG agent, ali GPG agent nije pokrenut ili je "
+"odgovorio sa krivom lozinkom.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Trenutno ste spojeni bez OpenPGP ključa."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Vaša lozinka nije točna"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Netočna OpenGPG Lozinka"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG nije pouzdan"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"GPG ključ koji se koristi za kriptiranje ovog razgovora nije pouzdan. Zaista "
+"želite kriptirati ovu poruku?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring je instaliran, ali nije \t\t\t\tispravno pokrenut (vjerojatno "
+"varijabla okruženja nije \t\t\t\tispravno postavljena)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Novi E-mail na %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Imate %d novi E-mail razgovor"
+msgstr[1] "Imate %d nova E-mail razovora"
+msgstr[2] "Imate %d novih E-mail razgovora"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Od: %(from_address)s\n"
+"Tema: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vam želi poslati datoteku."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Druga strana je prekinula prijenos"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Greška pri čitanju datoteke"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Uspješno ste primili %(filename)s od %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Uspješno ste poslali %(filename)s %(name)s"
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Nemoguće dekriptirati poruke od %s\n"
+"Možda ih je netko izmjenio."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Nemoguće dekriptirati poruku"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Konflikt korisničkog imena"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Molim unesite novo korisničko ime za vaš lokalni račun"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Greška."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Konflikt Resursa"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr "Već ste spojeni na ovaj račun sa istim resursom. Molim unesite novi."
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s vam želi poslati datoteku."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Zahtjev Razmjene Datoteka"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Greška kod ovjere SSL certifikata"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Došlo je do pogreške kod ovjere SSL certifikata vašeg jabber poslužitelja: %"
+"(error)s\n"
+"Još uvijek se želite povezati na ovaj poslužitelj?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignoriraj ovu grešku za ovaj certifikat."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Greška SSL certifikata"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Čini se da je SSL certifikat računa %(account)s promjenjen ili je vaša veza "
+"provaljena.\n"
+"Stari otisak: %(old)s\n"
+"Novi otisak: %(new)s\n"
+"\n"
+"Još uvijek se želite povezati i korigirati otisak certifikata?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Nesigurna Veza"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Spremate se poslati vašu lozinku preko nekriptirane veze. Jeste li sigurni "
+"da želite nastaviti?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Da, stvarno želim nesigurno povezivanje"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
+"instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP čvor nije obrisan"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP čvor %(node)s nije obrisan: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Emotikoni onemogućeni"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr "Postavljena tema emotikona nije pronađena, emotikoni su onemogućeni."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Nije moguće učitati postavljenu temu emotikona. Možda morate ažurirati "
+"format emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/"
+"Emoticons za više detalja."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Nije moguće spremanje vaših postavki"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Potrebna Lozinka"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Unesite GPG lozinku za ključ %(keyid)s (račun %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "GPG ključ istekao"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Vaš GPG ključ je istekao, biti će te spojeni na %s bez OpenPGP-a."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Kriva Lozinka"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Novi Grupni Razgovor"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Želio bih vas dodati na svoju listu kontakata"
 
@@ -9020,7 +8995,7 @@ msgstr "Kontakti"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Datum"
 
@@ -9031,7 +9006,7 @@ msgstr "Nadimak"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Poruka"
 
@@ -9057,194 +9032,190 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, pričekajte..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Izvozim Zapise..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s kaže: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Da li zaista želite ukloniti zabilješke odabranog kontakta?"
 msgstr[1] "Da li zaista želite ukloniti zabilješke odabranih kontakata?"
 msgstr[2] "Da li zaista želite ukloniti zabilješke odabranih kontakata?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Ovo je nepovratna operacija."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Da li zaista želite ukloniti odabranu poruku?"
 msgstr[1] "Da li zaista želite ukloniti odabrane poruke?"
 msgstr[2] "Da li zaista želite ukloniti odabrane poruke?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Povijest Razgovora sa %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Poruka Greške: %s"
+msgstr "Greška: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Greška."
+msgstr "Greška"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stauts je trenutno: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Niste spojeni na poslužitelj."
+msgstr "Zatvorit će te nekoliko kartica"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Da li zaista želite ukloniti odabranu poruku?"
+msgstr "Da li ih zaista želite sve zatvoriti?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- poruke će biti zapisane"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti zapisane"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je Promjenio Status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Se Prijavio"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Se Odjavio"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Jedna Poruka od %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Privatna Poruka iz privatnog razgovora %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:568
 msgid "Ignore"
-msgstr "_Ignoriraj"
+msgstr "Ignoriraj"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Dohvaćam profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Primljene informacije"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez veze ne možete objaviti informacije o sebi"
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Šaljem profil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Objava vCard neuspješna"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9252,46 +9223,51 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
 "ponovno kasnije."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Odobrenje je poslano"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako \"%s\" prihvati ovaj zahtjev znati će te njegov/njezin status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Biti će te spojeni na %s bez OpenPGP-a."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9299,28 +9275,27 @@ msgstr ""
 "Promjena vašeg statusa u nevidljivo rezultirati će odspajanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "desinkroniziran"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Zaista zatvori Gajim?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
+msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Uvijek zatvori Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Imte nepročitane poruke"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9328,16 +9303,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu "
 "povijest i kontakt je na vašoj listi."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9345,11 +9320,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9358,69 +9333,69 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovih "
 "prijenosa: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
-msgstr ""
-"Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
+msgstr "Spremate se blokirati kontakt. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Uvijek će te biti nedostupni za ovaj kontakt, i poruke koje pošalje nećete "
+"primiti."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Ukloni Grupu"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno ukloni i sve kontakte iz ove grupe sa liste kontakata"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Dodjeli OpenPGP Ključ"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za dodavanje kontaktu"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" biti će uklonjen sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
-msgstr ""
+msgstr "Spremate se ukloniti \"%(name)s\" (%(jid)s) sa vaše liste kontakata.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9429,11 +9404,11 @@ msgstr ""
 "će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9441,16 +9416,16 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno po pretpostavljenom uklanjate i odobrenje "
 "što konačno znači da će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status nakon uklanjanja"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9460,34 +9435,35 @@ msgstr ""
 "ujedno uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek "
 "vidjeti kao da ste odspojeni."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
+"Spremate se poslati osobni status. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Privremeno će te za ovaj kontakt imati status %(status)s, sve dok ne "
+"promijenite vaš status. Tada će vidjeti vaš globalni status."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate stvoriti račun prije nego što možete razgovarati sa drugim kontaktima."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9495,13 +9471,13 @@ msgstr ""
 "Vaš poslužitelj ne podržava spremanje informacija metakontakata. Te "
 "informacije neće biti spremljene kod sljedećeg spajanja."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9511,11 +9487,11 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9523,12 +9499,12 @@ msgstr[0] "Želite li poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Želite li poslati ove datoteke kontaktu %s:"
 msgstr[2] "Želite li poslati ove datoteke kontaktu %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Poslati %s"
+msgstr "Poslati %s prema %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Učini %s i %s pseudokontaktima"
@@ -9538,157 +9514,156 @@ msgstr "Učini %s i %s pseudokontaktima"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "na %s račun"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje Knjižni_m Oznakama..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "računa %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "za račun %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Objavi Glazbu"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Postavi Usluge..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Maksimiziraj Sve"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Pošalji _Grupnu Poruku"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Svim spojenim korisnicima"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Upravljanje Kontaktima"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Izmjeni _Grupe"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Pošalji Jednu Poruku"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Izvrši Naredbu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Upravljanje Prijenosom"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Izmjeni Prijenos"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maksimiziraj"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Odspoji"
+msgstr "_Ponovno spajanje"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Odspoji"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Upravitelj Zapisima"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Pridruži se Novom Grupnom Razgovoru"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Promijeni Statusnu Poruku..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Čekanje na rezultate"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Greška u primljenom podatkovnom obrascu"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Disk WriteError"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Potvrdi ove sesijske postavke"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9703,7 +9678,7 @@ msgstr ""
 "\n"
 "\tJesu li te postavke prihvatljive?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9718,116 +9693,116 @@ msgstr ""
 "\n"
 "Nastavi sesiju?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Promijeni Statusnu Poruku..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr "[blokirano]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr "[minimizirano]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Zadnji status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Spojen"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Odspojen"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Glazba:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Podizanje"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Nije početo"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Završeno"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?status prijenosa:Stanka"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Prenosim"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis nije još pružio detaljnije informacije"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9835,29 +9810,28 @@ msgstr ""
 "Ova usluga nije mogla odgovoriti sa detaljnim informacijama.\n"
 "Najvjerojatnije je zastarjela ili neispravna"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
-msgstr "?Klijent:Nepoznat"
+msgstr "?Vrijeme:Nepoznato"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pripadnost:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9865,7 +9839,7 @@ msgstr ""
 "Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9873,31 +9847,85 @@ msgstr ""
 "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/"
 "njega ne interesira vaše prisutstvo"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Vi i vaš kontakt ste zainteresirani za informacije o prisustvu jedno drugog"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Ne interesira vas prisutnost kontakta, niti vaša prisutnost zanima njega/nju"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Dolazna poruka:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Odlazna poruka:"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Domaćin %s koji ste postavili kao ft_add_hosts_to_send naprednu opciju "
+#~ "nije ispravan, biti će ignoriran."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Lozinka za OpenPGP nije unešena"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Ako želite nastaviti sa slanjem i primanjem poruka, morati će te se "
+#~ "ponovno spojiti."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Niste spojeni ili ste nevidljivi za druge. Vašu poruku nije moguće "
+#~ "poslati."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Ova poruka je kriptirana]"
+
+#~ msgid "%i days ago"
+#~ msgstr "Prije %i dana"
+
+#~ msgid "Trayicon"
+#~ msgstr "Trayicon"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Ikona u traci radne površine koja odražava trenutni status."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Potreban je python-gnome2-extras ili kompiliran trayicon modul iz Gajim "
+#~ "izvornog koda."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Potreban je PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Dodaj Posebnu _Obavijest"
 
diff --git a/po/it.po b/po/it.po
index ddc96dd9d..f8c654884 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-19 23:53+0200\n"
 "Last-Translator: neoex <neoex.dc@gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -283,9 +283,9 @@ msgstr "Modifica informazioni personali..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -294,9 +294,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Generale"
 
@@ -356,21 +356,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informazioni su di te, archiviate sul server"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Nessuno"
 
@@ -527,8 +527,8 @@ msgstr ""
 "Potresti considerare di cambiare la configurazione del firewall"
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "ID Jabber: "
 
@@ -542,7 +542,7 @@ msgid "Mer_ge accounts"
 msgstr "_Unisci account"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Ri_nomina"
 
@@ -949,7 +949,7 @@ msgstr "Ultima modifica:"
 msgid "New entry received"
 msgstr "Nuova voce ricevuta"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Hai ricevuto un nuovo evento:"
 
@@ -996,12 +996,12 @@ msgstr "Inserire nuova password:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Scrivere il nuovo messaggio di stato</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Attivato"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Stanza:"
@@ -1092,8 +1092,8 @@ msgstr "Modifica _gruppi..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "In_vita a "
 
@@ -1108,8 +1108,8 @@ msgid "Remo_ve"
 msgstr "_Elimina"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Invia s_tato personalizzato"
 
@@ -1142,8 +1142,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Permetti di _vedere il mio stato"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Blocca"
 
@@ -1154,7 +1154,7 @@ msgstr "_Proibisci di vedere il mio stato"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Cronologia"
 
@@ -1175,8 +1175,8 @@ msgid "_Subscription"
 msgstr "_Abbonamento"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Sblocca"
 
@@ -1269,7 +1269,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Mostra una notifica popup quando un trasferimento file viene completato"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Continua"
 
@@ -1277,7 +1277,7 @@ msgstr "_Continua"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifica quando un trasferimento file viene completato"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Apri cartella"
 
@@ -1305,7 +1305,7 @@ msgstr ""
 "Contatto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Grassetto"
 
@@ -1325,11 +1325,11 @@ msgstr "Personalizzazione temi di Gajim"
 msgid "Gone"
 msgstr "Andato via"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inattivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Corsivo"
 
@@ -1377,7 +1377,7 @@ msgstr "Cambia _oggetto..."
 msgid "Configure _Room..."
 msgstr "Configura la _stanza..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "Aggiungi _segnalibro"
 
@@ -1473,8 +1473,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gestore cronologia di Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Elimina"
 
@@ -1499,7 +1500,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Cerca nel database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Cronologia conversazione"
 
@@ -1524,7 +1525,7 @@ msgstr "_Memorizza cronologia conversazione"
 msgid "Bookmark this room"
 msgstr ""
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Entra in chat di gruppo"
 
@@ -1551,8 +1552,8 @@ msgstr "Recenti:"
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Entra"
 
@@ -1580,7 +1581,7 @@ msgstr "Minimizza automaticamente"
 msgid "Print status:"
 msgstr "Scrivi stato:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1704,17 +1705,26 @@ msgid "Show a list of formattings"
 msgstr "Clicca per inserire un emoticon (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Clicca per inserire un emoticon (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Invia"
 
@@ -1835,7 +1845,7 @@ msgstr ""
 "Rilevamento automatico ad ogni avvio di Gajim\n"
 "Usa sempre le applicazioni predefinite di GNOME\n"
 "Usa sempre le applicazioni predefinite di KDE\n"
-"Usa sempre le applicazioni predefinite XFCE4\n"
+"Usa sempre le applicazioni predefinite Xfce\n"
 "Personalizzate"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1853,6 +1863,16 @@ msgid "Configure color and font of the interface"
 msgstr "Configura colore e tipo di carattere per l'interfaccia"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Messaggio di _stato:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Nome contatto"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1861,34 +1881,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Mostra dettagli email _extra"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostra i _messaggi di stato dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1898,7 +1918,7 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono visualizzare nella finestra di chat."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1908,7 +1928,7 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono inviare al contatto."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1916,19 +1936,19 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si disconnette"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se marcato, Gajim entrerà in questa chat di gruppo all'avvio"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1936,19 +1956,19 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1956,7 +1976,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1964,7 +1984,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà il messaggio di stato di ogni membro di lista "
 "contatti e chat di gruppo sotto il suo nome"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1972,7 +1992,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1980,7 +2000,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1988,14 +2008,14 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2006,14 +2026,14 @@ msgstr ""
 "spamma o disturba. Usare con cautela, poiché verranno bloccati tutti i "
 "messaggi ricevuti da chi non è membro della lista contatti."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2022,7 +2042,7 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2032,13 +2052,13 @@ msgstr ""
 "(es. un contatto MSN avrà l'icona MSN equivalente per gli stati disponibile, "
 "assente, occupato, ecc...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2046,53 +2066,53 @@ msgstr ""
 "Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici animati o statici"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Rendi compatta la finestra dei _messaggi"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "_Gestisci..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "Demone delle notifiche"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Mostra notifica per i contatti che si _connettono"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Mostra notifica per i contatti che si _disconnettono"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Notifica le nuove e-mail su _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "Informazioni personali"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2102,24 +2122,24 @@ msgstr ""
 "Mostra una notifica\n"
 "Mostra solo nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Mostra evento nell'area di notifica"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2127,29 +2147,29 @@ msgstr ""
 "Alcuni messaggi potrebbero includere contenuto ricco (formattazione, colori, "
 "ecc.). Se selezionato, Gajim li mostrerà come messaggi semplici."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Ordina i contatti per stato"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "_Icone di stato:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "Style"
 msgstr "In stallo"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2157,7 +2177,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2165,110 +2185,112 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Usa le icone dei _trasporti"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Usa il sistema _predefinito"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Quando si riceve un nuovo evento:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Messaggio di errore: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "_Prima del nickname:"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "_Assente automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "Notifica dello stato di chat in _entrata:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticon:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Evidenzia parole errate"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non appartenenti alla lista"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignora la formattazione dei messaggi ricevuti"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "Messaggio in _arrivo:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Client di posta:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "_Non disponibile automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Messaggio in _uscita:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Reimposta ai colori di default"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "Notifica dello stato di chat in usci_ta:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entra in chat di _gruppo"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "Non nei contatti"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minuti"
 
@@ -2321,7 +2343,7 @@ msgstr "ID Jabber"
 msgid "Order:"
 msgstr "Ordine:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Lista privacy"
 
@@ -2485,7 +2507,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Privacy</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Suoni</b>"
@@ -2549,8 +2571,8 @@ msgstr "Rimuovi l'account da Gajim e dal _server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Elimina"
 
@@ -2569,13 +2591,13 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
+msgid "gtk-cancel"
 msgstr "gtk-close"
 
 #: ../data/glade/roster_window.glade.h:1
@@ -2635,7 +2657,7 @@ msgstr "_Azioni"
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -2676,11 +2698,11 @@ msgid "_Add contact"
 msgstr "_Aggiungi contatto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Informazioni"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Cerca"
 
@@ -2700,10 +2722,6 @@ msgstr "Registra a"
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2917,332 +2935,316 @@ msgstr "Risorsa:"
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informazioni sul contatto"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 #, fuzzy
 msgid "Service changed the session identifier."
 msgstr "Il client a %s ha annullato la negoziazione della sessione."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Attivato"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Disattivato"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Intero"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Colore"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Nome preferenza"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Valore"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Nessuna)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Nascosta"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Hai ricevuto un nuovo evento:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Hai ricevuto un nuovo evento:"
+msgstr[1] "Hai ricevuto un nuovo evento:"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Inglese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgaro"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretone"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Tedesco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Greco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Britannico"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Francese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Croato"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norvegese (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brasiliano"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Serbo"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Cinese (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Lingua per la correzione ortografica"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Il messaggio non può venire inviato finché non si è connessi."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "Sottolinea"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Servizio"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "_Carattere:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informazioni sul contatto"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifratura attivata"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Non nei contatti"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-#, fuzzy
-msgid "Unknown Artist"
-msgstr "Tipo sconosciuto %s "
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-#, fuzzy
-msgid "Unknown Title"
-msgstr "Tipo sconosciuto %s "
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-#, fuzzy
-msgid "Unknown Source"
-msgstr "Tipo sconosciuto %s "
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s della chat di gruppo %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usa autenticazione"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usa autenticazione"
@@ -3250,59 +3252,59 @@ msgstr "Usa autenticazione"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Negoziazione della sessione annullata"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Il seguente messaggio NON è stato cifrato"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "Il seguente messaggio NON è stato cifrato"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3310,23 +3312,23 @@ msgstr ""
 "Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
 "verrà perso."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 #, fuzzy
 msgid "Database Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
@@ -3335,23 +3337,23 @@ msgstr "%(nick)s è ora %(status)s"
 msgid "creating logs database"
 msgstr "creazione database log"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s è un file ma dovrebbe essere una cartella"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s è una cartella ma dovrebbe essere un file"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
@@ -3414,10 +3416,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Scegliere le chat di gruppo da cui vuoi uscire"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Chat di gruppo"
 
@@ -3526,9 +3528,9 @@ msgid ""
 msgstr "Lista (separata da spazi) di linee (account e gruppi) raggruppate."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "predefinito"
 
@@ -4179,7 +4181,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Workaround Jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4187,15 +4189,15 @@ msgstr ""
 "Se marcato, Gajim userà l'IP della macchina ed i proxy definiti nell'opzione "
 "file_transfer_proxies per il trasferimento file."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4203,111 +4205,111 @@ msgstr ""
 "Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
 "registrazione dei messaggi?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP è abilitato per questo contatto?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Linguaggio per il quale controllare le parole sbagliate"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "tutto o stati separati da uno spazio"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', o 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Torno tra qualche minuto."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Sono al telefono."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a divertirmi."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Sono disponibile."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Solo libero per chat."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Non sono disponibile."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4315,109 +4317,108 @@ msgstr ""
 "Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
 "muc_highlight_words, o quando un messaggio MUC contiene il tuo nickname."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Host errato"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Indirizzo locale non valido? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "La vCard è stata pubblicata correttamente"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "Migrazione GUI fallita"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname non permesso: %s"
@@ -4425,76 +4426,76 @@ msgstr "Nickname non permesso: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Sei stato bandito dalla stanza %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "La stanza %s non esiste."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Non è permessa la creazione di stanze."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Il tuo nickname è già in uso nella stanza di gruppo %s:"
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non sei nella lista dei membri nella chat di gruppo %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "La stanza è stata cancellata"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Puoi invece entrare in questa stanza: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "si è ora abbonati a %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "è stato ora cancellato l'abbonamento a %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4635,112 +4636,141 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Non è possibile inviare file vuoti"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Oggetto: %s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Riconnetti manualmente."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Il server %s ha risposto in maniera errata alla richiesta di registrazione: %"
 "s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Risposta non valida"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Il trasporto %s ha risposto in maniera errata alla richiesta di "
 "registrazione: %s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Connessione al proxy fallita"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Errore durante la rimozione della lista privacy"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4749,77 +4779,45 @@ msgstr ""
 "La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle "
 "risorse connesse. Disattivarla e riprovare."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Non è possibile inviare file vuoti"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Oggetto: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Gestisci contatti"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Non ottenuto a causa di stato invisibile"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Migrazione GUI fallita"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Osservatori"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Trasporti"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Non nei contatti"
 
@@ -5069,7 +5067,7 @@ msgstr "Libero per chat"
 msgid "_Available"
 msgstr "_Disponibile"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Disponibile"
 
@@ -5187,77 +5185,77 @@ msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d messaggio in attesa"
 msgstr[1] "%d messaggi in attesa"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " dalla stanza %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " dall'utente %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " da %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento in attesa"
 msgstr[1] "%d eventi in attesa"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5273,16 +5271,16 @@ msgid "%s is not a valid loglevel"
 msgstr "%s non è un livello di log valido"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "errore: impossibile aprire %s per lettura"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "Migrazione database delle cronologie agli indici"
 
@@ -5291,709 +5289,731 @@ msgstr "Migrazione database delle cronologie agli indici"
 msgid "XMPP account %s@%s"
 msgstr "dell'account %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "In pausa"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Grassetto"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Brave"
 msgstr "Ho "
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Chat"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Grassetto"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Contenuti"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completato"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Contenuti"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Disattivato"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 #, fuzzy
 msgid "Curious"
 msgstr "_Precedente"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Elimina"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Disappointed"
 msgstr "Disconnesso"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Dismayed"
 msgstr "Disabilitato"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Distracted"
 msgstr "Disabilitato"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Envious"
 msgstr "_Precedente"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Excited"
 msgstr "Attivato"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Gruppo"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "messaggio"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Attivato"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisibile"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "uno"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Tedesco"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "_Modifica"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 #, fuzzy
 msgid "Nervous"
 msgstr "_Precedente"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Offline"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Gruppo"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "undici"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "In stallo"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "Ultima modifica:"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Serious"
 msgstr "_Precedente"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "Nickname"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "Dormo"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Via:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Abbonati"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "Sottolinea"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host errato"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Sera"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "Scrivendo"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "Mattino"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "a tutti nel gruppo"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Sera"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "Sto cacciando %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entra"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Grooming"
 msgstr "stanza"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cambio oggetto"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "Sto cacciando %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 #, fuzzy
 msgid "Relaxing"
 msgstr "semplice"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "Sto cacciando %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "_Disconnessione"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "Motivo"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Motivo"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "Dormo"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Sto guardando un film."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Sono al telefono."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "Trasferimento in corso"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "Scrivendo"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 #, fuzzy
 msgid "On a Plane"
 msgstr "Online"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 #, fuzzy
 msgid "On a Train"
 msgstr "Apri come _Link"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "Scrivendo"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "Lavoro"
 
+#: ../src/common/pep.py:335
+#, fuzzy
+msgid "Unknown Artist"
+msgstr "Tipo sconosciuto %s "
+
+#: ../src/common/pep.py:338
+#, fuzzy
+msgid "Unknown Title"
+msgstr "Tipo sconosciuto %s "
+
+#: ../src/common/pep.py:341
+#, fuzzy
+msgid "Unknown Source"
+msgstr "Tipo sconosciuto %s "
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -6015,37 +6035,11 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"L'host %s che hai configurato come il ft_add_hosts_to_send opzione non è "
-"valida, perciò sarà ignorato."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Non è stata impostata la passphrase OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Ti connetterai a %s senza OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Errore avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6054,55 +6048,46 @@ msgstr ""
 "%s\n"
 "La messaggistica sulla rete locale potrebbe non funzionare correttamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Controllare se Avahi è installato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Impossibile avviare il servizio locale"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossibile collegarsi alla porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossibile cambiare lo stato dell'account  \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Tu non sei connesso o non sei visibile ad altri. Il tuo messaggio non può "
-"essere inviato."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Questo messaggio è cifrato]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6115,26 +6100,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Errore durante la creazione del servizio. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "Messaggi di stato preimpostati"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "Abilita"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dizionario per lingua %s non disponibile"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6143,222 +6128,222 @@ msgstr ""
 "E' necessario installare il dizionario %s per usare il controllo "
 "ortografico, o configurare un'altra lingua nelle opzioni speller_language"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se si vogliono applicare subito i cambiamenti, è necessario effettuare un "
 "nuovo login."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Eventi non letti"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Hai aperto una chat nell'account %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Tutte le finestre di chat e le chat di gruppo saranno chiuse. Desideri "
 "continuare?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Per cambiare nome account, è necessario leggere tutti gli eventi in attesa."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Questo nome è già usato da un altro account. Scegliere un altro nome."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Rinomina account"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Inserisci un nuovo nome per l'account %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "È necessario creare un nuovo account prima di poter modificare le "
 "informazioni personali."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Il server non supporta Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Il server non può salvare le informazioni personali."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Per favore rinominalo o rimuovilo prima di abilitare la messaggistica sulla "
 "rete locale."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6366,11 +6351,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6378,11 +6363,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6390,11 +6375,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6402,7 +6387,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6420,58 +6405,59 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Tutti"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "Nessuno"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Nuova chat di gruppo"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6479,29 +6465,29 @@ msgstr ""
 "segnalibro."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Nickname non valido"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Nickname non permesso: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Server non valido"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Voce non valida"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6512,33 +6498,33 @@ msgstr ""
 "\", o farlo più tardi scegliendo la voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Per favore fornire il server su cui vuoi registrarti."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6548,7 +6534,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6556,72 +6542,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Email GMail ricevuta"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6630,223 +6616,220 @@ msgstr ""
 "Il testo sotto a questa riga è quanto è stato detto dall'ultima volta che si "
 "è prestata attenzione a questa chat di gruppo"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Esci"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Manca un \"%s\" nell'URL del Dizionario e questo non è WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Apri come _Link"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Ieri"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i giorni fa"
+msgid_plural "%i days ago"
+msgstr[0] "Ieri"
+msgstr[1] "Ieri"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Client IM Jabber"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome contatto: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID Jabber: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Nome contatto"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Sovrascrivere messaggio di stato?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Questo nome è già stato utilizzato. Vuoi sovrascrivere questo messaggio di "
 "stato?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Salva come messaggio di stato predefinito"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Inserire un nome per questo messaggio di stato"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Indirizzo AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Numero GG:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Numero ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Indirizzo MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Indirizzo Yahoo!:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Inserire i dati del contatto che si vuole aggiungere all'account %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Inserire i dati del contatto che si vuole aggiungere"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista contatti."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Versione di GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Versione di PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Sviluppatori attuali:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Dulcis in fundo, ringraziamo tutti i gestori dei pacchetti"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
@@ -6854,7 +6837,7 @@ msgstr ""
 "Matteo Dell'Amico <della@linux.it>\n"
 "Daniel Coppi <neoex.dc@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6867,401 +6850,434 @@ msgstr ""
 "\n"
 "L'evidenziazione delle parole errate non verrà usata"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Il nickname contiene caratteri non consentiti."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Richiesta di abbonamento per l'account %s da %s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Si è già nella stanza %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non è possibile unirsi a chat di gruppo quando non si è connessi."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Il nome account non è valido"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nickname non valido"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Il nome della stanza o del server contiene caratteri non permessi."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Questa non è una chat di gruppo"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non è il nome di una chat di gruppo"
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Questo account non è connesso al server"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non puoi sincronizzarti con un account a meno che non sia connesso."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Sincronizza"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "Introdurre il nickname o l'ID del contatto con cui chattare:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile processare \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Stato Contatto Cambiato"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr " da %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "Console XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "In stallo"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "_Modifica"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Elimina"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Vorrei aggiungerti alla mia lista contatti."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 #, fuzzy
 msgid "Add"
 msgstr "Indirizzo"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "_Modifica"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber: "
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Gruppo"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Aggiungi contatto"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Elimina il contatto dalla lista"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privacy <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordine: %s, azione: %s, tipo: %s, valore: %s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordine: %s, azione: %s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifica una regola</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Liste privacy"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Nome lista non valido"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Non si è entrati in una chat di gruppo."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ti ha invitato a partecipare a una discussione"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ti ha invitato alla chat di gruppo %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "Vuoi inviare questo file a %s:"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Condizione"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "quando io sono "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7269,39 +7285,39 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 #, fuzzy
 msgid "Have you verified the contact's identity?"
 msgstr "Verifica l'identità del client remoto"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7311,31 +7327,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Altri"
@@ -7345,25 +7380,25 @@ msgstr "Altri"
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7371,304 +7406,284 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Questo tipo di servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Server non valido"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Consulta %s usando l'account %s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "C_onsulta"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Esegui comando"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Descrizione"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
 "della lista contatti."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Abbonati"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Nuovo post"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Una libreria usata per validare i certificati del server per assicurare una "
 "connessione sicura."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Richiede python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour/Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Sistema di chat senza server con i client rilevati automaticamente nella "
 "rete locale."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Richiede python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Richiede pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Comandi: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 #, fuzzy
 msgid "A script to control Gajim via commandline."
 msgstr "Uno script per controllare gajim dalla riga di comando."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Richiede python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Caratteristica non disponibile sotto Windows."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Cifratura OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Cifratura dei messaggi di chat con le chiavi gpg."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Richiede gpg e python-GnuPGInterface"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "Gestore connessione"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Riconoscimento automatico dello stato della connessione."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Richiede gnome-network-manager e python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Gestore sessioni"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "La sessione di Gajim viene salvata alla chiusura e ripristinata all'avvio."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Richiede python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Le password non coincidono"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Le password possono essere salvate in modo sicuro e non in un semplice file "
 "di testo."
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Richiede gnome-keyring e python-gnome2-desktop."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 #, fuzzy
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Possibilità di connettersi ai server che usano record SRV."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Richiede dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Richiede nslookup per usare i record SRV."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Correttore ortografico"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Correzione ortografica dei messaggi."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 #, fuzzy
 msgid "Requires libgtkspell."
 msgstr "Richiede python-dbus."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Demone delle notifiche"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Popup passivi che notificano nuovi eventi."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "Richiede python-notify, oppure python-dbus e notification-daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Icona nell'area di notifica"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Un'icona nell'area di notifica che riflette lo stato attuale."
-
 #: ../src/features_window.py:88
 #, fuzzy
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Richiede python-gnome2-extras oppure la compilazione del modulo trayicon dai "
-"sorgenti di Gajim."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Richiede PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
 msgstr "_Modifica lo stato"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Possibilità di misurare il tempo di inattività, per poter cambiare lo stato "
 "automaticamente."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Richiede python-gnome2."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Trasforma le espressioni LaTeX comprese in $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 #, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
@@ -7677,7 +7692,7 @@ msgstr ""
 "Richiede texlive-latex-base, dvips e imagemagick. Devi impostare 'use_latex' "
 "su Attivato nell'Editor di configurazione avanzata."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 #, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
@@ -7686,26 +7701,26 @@ msgstr ""
 "Richiede texlive-latex-base, dvips e imagemagick. Devi impostare 'use_latex' "
 "su Attivato nell'Editor di configurazione avanzata."
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Attiva cifratura end-to-end"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Cifratura dei messaggi di chat."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Richiede python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Generatore RST"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7713,24 +7728,37 @@ msgstr ""
 "Genera output XHTML a partire da codice RST (vedi http://docutils."
 "sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Richiede python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 #, fuzzy
 msgid "Requires python-sexy."
 msgstr "Richiede python-dbus."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Richiede python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Funzione"
 
@@ -7746,108 +7774,108 @@ msgstr "Tempo"
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Dimensione: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Tu"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Trasferimento file annullato"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "La connessione non può essere stabilita."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Messaggio di errore: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Scegliere il file da inviare..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Descrizione: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Questo file è in uso da un altro processo."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non è possibile sovrascrivere il file esistente \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7855,33 +7883,33 @@ msgstr ""
 "Un file con lo stesso nome è già presente e non si ha il permesso per "
 "sovrascriverlo"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Cosa fare?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "La cartella \"%s\" non è scrivibile."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Non si ha il permesso di creare file in questa cartella."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Salva file come..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7889,32 +7917,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "File non valido"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pausa"
 
@@ -7984,11 +8012,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim è già in esecuzione"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7996,486 +8024,77 @@ msgstr ""
 "Un'altra istanza di Gajim sembra essere in esecuzione\n"
 "Continuare comunque?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Passphrase richiesta"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Inserire la passphrase della chiave GPG per l'account %s."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Ti connetterai a %s senza OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Passphrase errata"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Riscrivere la passphrase GPG o premere Annulla."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Il nickname desiderato è in uso o registrato da un altro partecipante alla "
-"chat di gruppo %s.\n"
-"Specificare un altro nickname sotto:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Accettare questa richiesta?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Accettare questa richiesta?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Connessione fallita"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "errore durante l'invio di %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Richiesta di abbonamento"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorizzazione accettata"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Disa_bbonati"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Non si può contattare \"%s\""
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s è ora conosciuto come %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s è ora %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Tutti i partecipanti possono vedere il tuo JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "La stanza ora mostra i membri non disponibili"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "la stanza ora non mostra i membri non disponibili"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"E' stata effettuata una modifica alla configurazione della stanza che non "
-"riguarda la privacy"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "La registrazione dei messaggi della stanza è stata attivata"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "La registrazione dei messaggi della stanza è stata disattivata"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "La stanza è ora completamente non anonima"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "La stanza è ora semi-anonima"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "La stanza è ora completamente anonima"
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"È necessaria una password per entrare nella stanza %s. Inserisci la password"
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Sei connesso senza la chiave OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Passphrase errata"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Passphrase errata"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "Non è possibile utilizzare GPG"
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Non chiederlo più"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring è installato ma non avviato correttamente (la variabile "
-"d'ambiente è probabilmente impostata in maniera non corretta)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nuova e-mail su %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "C'è %d nuova conversazione in e-mail"
-msgstr[1] "Ci sono %d nuove conversazioni in e-mail"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s vuole inviarti un file."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Elimina il contatto dalla lista"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Errore leggendo il file:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "%(filename)s ricevuto con successo da %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Invio di %(filename)s a %(name)s effettuato con successo."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "In tutti i _messaggi"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Conflitto di nomi utenti"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Inserire un nuovo nome utente per l'account locale"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Errore."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Conflitto tra risorse"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Connessione"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Stai per creare un metacontatto. Continuare?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Cifratura disattivata"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Impossibile salvare impostazioni e preferenze"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Mostra un aiuto su di un comando specifico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "mostra aiuto sul comando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Apre una finestra con il prossimo evento in attesa"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "Scrive la lista contatti. Ogni contatto appare su una linea separata"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "mostra solo i contatti dell'account dato"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Scrive un elenco degli account registrati"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Cambia lo stato degli account"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "messaggio"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "messaggio di stato"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8484,22 +8103,22 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Cambia lo stato degli account"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Priori_tà:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Voglio _registrare un nuovo account"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8509,24 +8128,24 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Mostra la finestra di chat per mandare messaggi ad un contatto"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contatto con cui si vuole chattare"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se specificato, il contatto è preso dalla lista contatti di questo account"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8536,30 +8155,30 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "chiave pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se specificato, il messaggio verrà cifrato usando questa chiave pubblica"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8569,138 +8188,138 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "oggetto"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "oggetto del messaggio "
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Invia nuovi messaggi alla chat di gruppo in cui sei entrato."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID della stanza che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Invia file ad un contatto"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Percorso file"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chiave' è il nome della preferenza, 'valore' è il valore a cui impostarla"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "chiave"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nome della preferenza da eliminare"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Scrive lo stato corrente delle preferenze di Gajim nel file .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Aggiunge il contatto alla lista"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Aggiunge un nuovo contatto a questo account"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Restituisce lo stato corrente (quello globale se non è specificato un "
 "account)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Restituisce il messaggio di stato corrente (quello globale se non è "
 "specificato un account)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Restituisce il numero di messaggi non letti"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Apre la finestra di inizio chat"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Inizia chat usando questo account"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Invia XML personalizzato"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML da inviare"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8708,79 +8327,79 @@ msgstr ""
 "L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
 "tutti gli account."
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Gestisci un uri xmpp:/"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Account in which you want to handle it"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Entra in una stanza MUC"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "stanza"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Stanza:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "nickname"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Le password non coincidono"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Account from which you want to enter the room"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8789,31 +8408,31 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8822,7 +8441,7 @@ msgstr ""
 "Utilizzo: %s comando [parametri]\n"
 "Il comando è uno fra:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8831,7 +8450,7 @@ msgstr ""
 "Troppi parametri. \n"
 "Scrivere \"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8840,7 +8459,7 @@ msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "URI errato"
 
@@ -8869,152 +8488,176 @@ msgstr "Non è possibile eliminare il tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Non sei più nella stanza \"%s\" o \"%s\" è uscito."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Inserisci nickname"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "Cronologia conversazione"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Connessione"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Tutti i partecipanti possono vedere il tuo JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "E' stata creata una nuova stanza"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Il server ha assegnato o modificato il tuo nickname"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato bloccato da %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s è ora conosciuto come %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s è stato cacciato dalla stanza (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "l'affiliazione è stata cambiata"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "la stanza è ora accessibile solo ai membri"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 #, fuzzy
 msgid "system shutdown"
 msgstr "spegnimento del sistema"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s è entrato nella chat di gruppo"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s è ora %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Chiudendo questa finestra, si verrà disconnessi da questa stanza."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Non chiederlo più"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Eliminazione %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9022,22 +8665,22 @@ msgstr ""
 "Stai per cancellare definitivamente questa stanza.\n"
 "Puoi specificare il motivo qui sotto:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Puoi anche inserire un nome alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -9063,60 +8706,455 @@ msgid "Details"
 msgstr "Dettagli"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Errore processando il file:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Non si è potuto scrivere su %s. Il supporto gestione sessioni non funzionerà"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim non è il client Jabber predefinito"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Si vuole rendere Gajim il client Jabber predefinito?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Verifica sempre se Gajim è il client Jabber predefinito all'avvio"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "L'immagine non può essere salvata in formato %(type)s. Salvarla come %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Salva immagine come..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Il nickname desiderato è in uso o registrato da un altro partecipante alla "
+"chat di gruppo %s.\n"
+"Specificare un altro nickname sotto:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Accettare questa richiesta?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Accettare questa richiesta?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Connessione fallita"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "errore durante l'invio di %s ( %s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Richiesta di abbonamento"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorizzazione accettata"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Disa_bbonati"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Non si può contattare \"%s\""
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "La stanza ora mostra i membri non disponibili"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "la stanza ora non mostra i membri non disponibili"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"E' stata effettuata una modifica alla configurazione della stanza che non "
+"riguarda la privacy"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "La registrazione dei messaggi della stanza è stata attivata"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "La registrazione dei messaggi della stanza è stata disattivata"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "La stanza è ora completamente non anonima"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "La stanza è ora semi-anonima"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "La stanza è ora completamente anonima"
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
+"È necessaria una password per entrare nella stanza %s. Inserisci la password"
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Sei connesso senza la chiave OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Passphrase errata"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Passphrase errata"
+
+#: ../src/gui_interface.py:1170
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "Non è possibile utilizzare GPG"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring è installato ma non avviato correttamente (la variabile "
+"d'ambiente è probabilmente impostata in maniera non corretta)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nuova e-mail su %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "C'è %d nuova conversazione in e-mail"
+msgstr[1] "Ci sono %d nuove conversazioni in e-mail"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vuole inviarti un file."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Elimina il contatto dalla lista"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Errore leggendo il file:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "%(filename)s ricevuto con successo da %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Invio di %(filename)s a %(name)s effettuato con successo."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "In tutti i _messaggi"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Conflitto di nomi utenti"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Inserire un nuovo nome utente per l'account locale"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Errore."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Conflitto tra risorse"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s vuole inviarti un file."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Richiesta di trasferimento file"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Connessione"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Stai per creare un metacontatto. Continuare?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Cifratura disattivata"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Impossibile salvare impostazioni e preferenze"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Passphrase richiesta"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Inserire la passphrase della chiave GPG per l'account %s."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Ti connetterai a %s senza OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Passphrase errata"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Riscrivere la passphrase GPG o premere Annulla."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti ai miei contatti"
 
@@ -9131,7 +9169,7 @@ msgstr "Contatti"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Data"
 
@@ -9142,7 +9180,7 @@ msgstr "Nickname"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Messaggio"
 
@@ -9167,16 +9205,16 @@ msgstr ""
 "\n"
 "Nel caso si prema SÌ, attendere..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Esportazione cronologie..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s alle %(time)s ha detto: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] ""
@@ -9184,178 +9222,178 @@ msgstr[0] ""
 msgstr[1] ""
 "Si vuole davvero eliminare la cronologia per i contatti selezionati?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Questa operazione è irreversibile."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Si vuole davvero eliminare il messaggio selezionato?"
 msgstr[1] "Si vogliono davvero eliminare i messaggi selezionati?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Cronologia conversazione con %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 #, fuzzy
 msgid "Disk Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ora è %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Messaggio di errore: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 #, fuzzy
 msgid "Error"
 msgstr "Errore."
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "L'immagine è troppo grande"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non si è connessi al server"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Si vuole davvero eliminare il messaggio selezionato?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Chat private"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Messaggi"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- i messaggi saranno registrati"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- i messaggi non saranno registrati"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ha cambiato stato"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s connesso"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s disconnesso"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuovo messaggio singolo da %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuovo messaggio privato dalla stanza %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Messaggio inviato da %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuovo messaggio da %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "nove"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Recupero profilo..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Il file è vuoto"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informazioni ricevute"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senza una connessione non è possibile pubblicare i dati personali."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Invio del profilo..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informazione NON pubblicata"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9363,46 +9401,51 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprovare più tardi."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Autorizzazione inviata"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" accetta questa richiesta conoscerai il suo stato."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Ti connetterai a %s senza OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Si sta partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9410,28 +9453,28 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Si è sicuri di voler uscire dalle stanze \"%s\"?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9440,16 +9483,16 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9457,11 +9500,11 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9470,69 +9513,69 @@ msgstr ""
 "Non si potranno inviare e ricevere messaggi verso i contatti di questi "
 "trasporti:%s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Rinomina contatto"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserire un nuovo nickname per il contatto %s."
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserire un nome per il gruppo %s."
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Elimina Gruppo"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Rimuovere il gruppo %s dalla lista?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Elimina anche tutti i contatti di questo gruppo dalla lista"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9541,12 +9584,12 @@ msgstr ""
 "ti vedrà sempre offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Cosa fare?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9554,16 +9597,16 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Voglio che questo contatto conosca il mio stato dopo la rimozione"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9572,33 +9615,33 @@ msgstr ""
 "Eliminando questi contatti:%s\n"
 "ne verrà rimossa anche l'autorizzazione. Ti vedranno sempre offline."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "È necessario creare un account prima di poter chattare con altri contatti."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9607,12 +9650,12 @@ msgstr ""
 "Il tuo server non supporta il salvataggio di informazioni metacontatti. "
 "Perciò queste informazioni non saranno salvate al prossimo riavvio."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9622,24 +9665,24 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account jabber o su "
 "vari transport."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "File non valido"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vuoi inviare questo file a %s:"
 msgstr[1] "Vuoi inviare questi file a %s:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Invia %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Rendi %s e %s metacontatti"
@@ -9649,160 +9692,160 @@ msgstr "Rendi %s e %s metacontatti"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Gestione segnalibri..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "dell'account %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Pubblica"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Configura la _stanza..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Massimizza tutti"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Invia _messaggio di gruppo"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Utenti _online"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Gestisci contatti"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Invia messaggio singolo"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Gestisci trasporto"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Modifica trasporto"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Massimizza"
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Disconnetti"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Gestore cronologia"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Ricerca in corso"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Errore nella ricezione dei dati"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Nessun risultato"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 #, fuzzy
 msgid "Disk WriteError"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Oggetto: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Conferma queste opzioni di sessione"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9817,7 +9860,7 @@ msgstr ""
 "\n"
 "\tQueste opzioni sono accettabili?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9832,117 +9875,117 @@ msgstr ""
 "\n"
 "Continuare la sessione?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "ID Jabber: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s di questa chat di gruppo"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [bloccato]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [minimizzata]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Ultimo stato: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " dalle %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Connesso"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Disconnesso"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Abbonamento: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Completato"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?transfer status:In pausa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9950,30 +9993,30 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "dalle %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Applicazioni</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9981,7 +10024,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9989,14 +10032,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tu ed il contatto siete reciprocamente interessati alle informazioni sulla "
 "presenza dell'altro"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10004,19 +10047,74 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Sei in attesa della risposta del contatto alla tua richiesta di abbonamento"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "Messaggio in _arrivo:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "Messaggio in _uscita:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-close"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "L'host %s che hai configurato come il ft_add_hosts_to_send opzione non è "
+#~ "valida, perciò sarà ignorato."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Non è stata impostata la passphrase OpenPGP"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Tu non sei connesso o non sei visibile ad altri. Il tuo messaggio non può "
+#~ "essere inviato."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Questo messaggio è cifrato]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i giorni fa"
+
+#~ msgid "Trayicon"
+#~ msgstr "Icona nell'area di notifica"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Un'icona nell'area di notifica che riflette lo stato attuale."
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Richiede python-gnome2-extras oppure la compilazione del modulo trayicon "
+#~ "dai sorgenti di Gajim."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Richiede PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Crea _notifica speciale"
 
@@ -10708,9 +10806,6 @@ msgstr " risorsa con priorità "
 #~ msgid "A_fter nickname:"
 #~ msgstr "_Dopo il nickname:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "_Prima del nickname:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Dopo l'ora:"
 
diff --git a/po/lt.po b/po/lt.po
index 5b3ee1c1c..ca5117fdc 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-19 23:55+0200\n"
 "Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
 "Language-Team: Lithuanian <>\n"
@@ -30,9 +30,8 @@ msgstr "Jabber IM Klientas"
 
 #: ../data/glade/account_context_menu.glade.h:1
 #: ../data/glade/roster_window.glade.h:7
-#, fuzzy
 msgid "Join _Group Chat..."
-msgstr "Prisijungti prie pokalbio grupėje"
+msgstr "Jungtis į _Grupės Pokalbį..."
 
 #: ../data/glade/account_context_menu.glade.h:2
 msgid "_Add Contact..."
@@ -48,24 +47,21 @@ msgid "_Execute Command..."
 msgstr "_Vykdyti komandą..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
 msgid "_Modify Account"
-msgstr "Keisti Prieigą"
+msgstr "_Keisti Prieigą"
 
 #: ../data/glade/account_context_menu.glade.h:6
 msgid "_Open Gmail Inbox"
 msgstr "_Atidaryti Gmail paštą"
 
 #: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
 msgid "_Personal Events"
-msgstr "Asmeninė Informacija"
+msgstr "_Asmeniniai Įvykiai"
 
 #: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/roster_window.glade.h:25
-#, fuzzy
 msgid "_Start Chat..."
-msgstr "_Pradėti pokalbį"
+msgstr "_Pradėti pokalbį..."
 
 #: ../data/glade/account_context_menu.glade.h:9
 #: ../data/glade/zeroconf_context_menu.glade.h:2
@@ -73,13 +69,12 @@ msgid "_Status"
 msgstr "_Būklė"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:1
-#, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
-"<b>Prieiga kuriama</b>\n"
+"<b>Jungiamasi prie serverio</b>\n"
 "\n"
 "Prašome palaukti..."
 
@@ -88,9 +83,8 @@ msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Prašome pasirinkti vieną iš variantų žemiau:</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:5
-#, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
-msgstr "<b>Prašome užpildyti naujos Jūsų prieigos duomenis</b>"
+msgstr "<b>Įveskite jūsų turimos prieigos duomenis</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
 msgid "<b>Please select a server</b>"
@@ -107,9 +101,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Naudoti autentifikaciją"
+msgstr "Anoniminė autentikacija"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -120,9 +113,8 @@ msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Prieigos kūrimo vedlys"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:14
-#, fuzzy
 msgid "I already have an account I want to _use"
-msgstr "Jau turiu prieigą, kurią noriu naudoti"
+msgstr "Jau turiu prieigą, kurią noriu _naudoti"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
@@ -140,9 +132,8 @@ msgid "Manage..."
 msgstr "Valdyti..."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:18
-#, fuzzy
 msgid "Prox_y:"
-msgstr "Proksis:"
+msgstr "_Proksis:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
@@ -177,9 +168,8 @@ msgid "_Finish"
 msgstr "_Baigti"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:26
-#, fuzzy
 msgid "_Hostname:"
-msgstr "Serverio adresas: "
+msgstr "_Serverio adresas: "
 
 #: ../data/glade/account_creation_wizard_window.glade.h:27
 #: ../data/glade/account_modification_window.glade.h:48
@@ -229,9 +219,8 @@ msgstr "Prieigos keitimas"
 
 #: ../data/glade/account_modification_window.glade.h:6
 #: ../data/glade/accounts_window.glade.h:8
-#, fuzzy
 msgid "Administration operations"
-msgstr "Administrator List"
+msgstr "Administravimo operacijos"
 
 #: ../data/glade/account_modification_window.glade.h:7
 #: ../data/glade/accounts_window.glade.h:10
@@ -286,9 +275,9 @@ msgstr "Keisti asmeninę informaciją..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -297,9 +286,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Bendros parinktys"
 
@@ -358,21 +347,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacija apie jus, kur yra išsaugota serveryje"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Raktas nepasirinktas"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Joks"
 
@@ -452,9 +441,8 @@ msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
 #: ../data/glade/account_modification_window.glade.h:43
 #: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
 msgid "Synchronise contacts"
-msgstr "Rodyti _Atsijungusius Asmenis"
+msgstr "Sinchronizuoti kontaktus"
 
 #: ../data/glade/account_modification_window.glade.h:44
 msgid "Use _SSL (legacy)"
@@ -475,12 +463,10 @@ msgid "_Name:"
 msgstr "_Pavadinimas:"
 
 #: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
 msgid "<b>Proxy</b>"
-msgstr "<i>Privatus Sąrašas</i>"
+msgstr "<i>Proksis</i>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
 msgstr "_Nustatyti būklei"
 
@@ -489,9 +475,8 @@ msgid "Accounts"
 msgstr "Prieiga"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Naudoti autentifikaciją"
+msgstr "Anoniminė autentikaciją"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -500,7 +485,6 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
 msgstr "_Prisijungti, kai Gajim pasileis"
 
@@ -515,9 +499,8 @@ msgid "First Name:"
 msgstr "Vardas:"
 
 #: ../data/glade/accounts_window.glade.h:24
-#, fuzzy
 msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Jei pažymėta, Gajim prisimins šios prieigos slaptažodį"
+msgstr "Jei pažymėta, Gajim ims slaptažodį iš GPG agento, tokio kaip seahorse"
 
 #: ../data/glade/accounts_window.glade.h:29
 msgid ""
@@ -530,8 +513,8 @@ msgstr ""
 "Turėtumėte pakeisti leistinus ugniasienės nustatymus."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -545,17 +528,15 @@ msgid "Mer_ge accounts"
 msgstr "Apjun_gti prieigas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Pe_rvadinti"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
 msgstr "Siųsti „aš-gyvas“ paketus"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
 
@@ -564,39 +545,32 @@ msgid "Use G_PG Agent"
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Naudoti parinktą serverio adresą/prievadą"
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Use custom port:"
+msgstr "Naudoti parinktą prievadą:"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "Keisti asmeninę informaciją..."
+msgstr "_Keisti Asmeninę Informaciją..."
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Įjungti"
+msgstr "Į_jungti"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
-msgstr "Serverio adresas: "
+msgstr "_Serverio adresas: "
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Valdyti..."
+msgstr "_Valdyti..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
-msgstr "_Portas:"
+msgstr "_Prievadas:"
 
 #: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
@@ -739,18 +713,16 @@ msgid "Deletes Message of the Day"
 msgstr "Ištrins dienos žinutę"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-#, fuzzy
 msgid "Edit _Privacy Lists..."
-msgstr "_Privatūs sąrašai"
+msgstr "Keisti _Privačiuosius Sąrašus..."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Sends a message to users currently connected to this server"
 msgstr "Bus išsiųstos žinutės naudotojams, prisijungusiems prie šio serverio"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:5
-#, fuzzy
 msgid "Set MOTD..."
-msgstr "Nustatyti MOTD"
+msgstr "Nustatyti MOTD..."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
@@ -761,9 +733,8 @@ msgid "Show _XML Console"
 msgstr "Rodyti _XML konsolę"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:8
-#, fuzzy
 msgid "Update MOTD..."
-msgstr "Atnaujinti MOTD"
+msgstr "Atnaujinti MOTD..."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
@@ -774,9 +745,8 @@ msgid "_Administrator"
 msgstr "_Administratorius"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
 msgid "_Send Server Message..."
-msgstr "_Siųsti žinutę serveriui"
+msgstr "_Siųsti Žinutę Serveriui..."
 
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
@@ -955,19 +925,17 @@ msgstr "Paskutinį kartą keista:"
 msgid "New entry received"
 msgstr "Gautas naujas įrašas"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Jūs gavote naują įrašą:"
 
 #: ../data/glade/blocked_contacts_window.glade.h:1
-#, fuzzy
 msgid "Blocked Contacts"
-msgstr "Contacts"
+msgstr "Užblokuoti Kontaktai"
 
 #: ../data/glade/change_activity_dialog.glade.h:1
-#, fuzzy
 msgid "<b>Message:</b> "
-msgstr "<b>Nustatytosios būklės žinutės</b>"
+msgstr "<b>Žinutė:</b> "
 
 #: ../data/glade/change_activity_dialog.glade.h:2
 msgid "Set Activity"
@@ -978,14 +946,12 @@ msgid "Set an activity"
 msgstr ""
 
 #: ../data/glade/change_mood_dialog.glade.h:1
-#, fuzzy
 msgid "<b>Message:</b>"
-msgstr "<b>Savybės</b>"
+msgstr "<b>Žinutė:</b>"
 
 #: ../data/glade/change_mood_dialog.glade.h:2
-#, fuzzy
 msgid "<b>Mood:</b>"
-msgstr "<b>Garsai</b>"
+msgstr "<b>Nuotaika:</b>"
 
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
@@ -1003,15 +969,13 @@ msgstr "Įveskite naują slaptažodį:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Įveskite naują būklės žinutę</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
-#, fuzzy
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
-msgstr "Activated"
+msgstr "Aktyvumas:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
-#, fuzzy
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
-msgstr "Kambarys:"
+msgstr "Nuotaika:"
 
 #: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
@@ -1027,9 +991,8 @@ msgstr "Prisijungti prie pokalbio grupėje"
 
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
 msgid "_Add to Roster..."
-msgstr "Įtr_aukti į kontaktų sąrašą"
+msgstr "Įtr_aukti į kontaktų sąrašą..."
 
 #: ../data/glade/chat_context_menu.glade.h:3
 msgid "_Copy JID/Email Address"
@@ -1054,18 +1017,16 @@ msgid "_Start Chat"
 msgstr "_Pradėti pokalbį"
 
 #: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
 msgid "In_vite"
-msgstr "Pak_viesti į"
+msgstr "Pak_viesti"
 
 #: ../data/glade/chat_to_muc_window.glade.h:2
 msgid "Invite Friends!"
 msgstr ""
 
 #: ../data/glade/chat_to_muc_window.glade.h:3
-#, fuzzy
 msgid "MUC server"
-msgstr "Observers"
+msgstr "MUC serveris"
 
 #: ../data/glade/chat_to_muc_window.glade.h:4
 msgid "Please select a MUC server."
@@ -1082,57 +1043,49 @@ msgid "A_sk to see his/her status"
 msgstr "Siųsti užklausimą, kad galėtumėte matyti jo/jos būklę"
 
 #: ../data/glade/contact_context_menu.glade.h:2
-#, fuzzy
 msgid "Add Special _Notification..."
-msgstr "Add Special _Notification"
+msgstr "Įtraukti Specialų Pranešimą..."
 
 #: ../data/glade/contact_context_menu.glade.h:3
-#, fuzzy
 msgid "Assign Open_PGP Key..."
-msgstr "Priskirti Open_PGP Raktą"
+msgstr "Priskirti Open_PGP Raktą..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Vykdyti Komandą..."
+msgstr "_Vykdyti Komandą..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
-#, fuzzy
 msgid "Edit _Groups..."
-msgstr "Redaguoti _Grupes"
+msgstr "Keisti _Grupes..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "Pak_viesti į"
 
 #: ../data/glade/contact_context_menu.glade.h:7
-#, fuzzy
 msgid "Invite _Contacts"
-msgstr "Rename Contact"
+msgstr "Kviesti Kontaktus"
 
 #: ../data/glade/contact_context_menu.glade.h:8
-#, fuzzy
 msgid "Remo_ve"
 msgstr "_Trinti"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
-#, fuzzy
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
-msgstr "Sends custom XML"
+msgstr "Siųsti _Parinktą Būklę"
 
 #: ../data/glade/contact_context_menu.glade.h:10
 msgid "Send Single _Message..."
 msgstr "Siųsti ži_nutę..."
 
 #: ../data/glade/contact_context_menu.glade.h:11
-#, fuzzy
 msgid "Send _File..."
-msgstr "Siųsti _Failą"
+msgstr "Siųsti _Failą..."
 
 #: ../data/glade/contact_context_menu.glade.h:12
 msgid "Set Custom _Avatar..."
@@ -1143,9 +1096,8 @@ msgid "Start _Chat"
 msgstr "Pradėti _Pokalbį"
 
 #: ../data/glade/contact_context_menu.glade.h:14
-#, fuzzy
 msgid "Toggle End to End Encryption"
-msgstr "Įjungti Open_PGP kodavimą"
+msgstr "Įjungti Abipusį Šifravimą"
 
 #: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
@@ -1156,8 +1108,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Leisti jam/jai matyti mano būklę"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1168,7 +1120,7 @@ msgstr "_Drausti jam/jai matyti mano būklę"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Istorija"
 
@@ -1177,29 +1129,26 @@ msgid "_Ignore"
 msgstr ""
 
 #: ../data/glade/contact_context_menu.glade.h:22
-#, fuzzy
 msgid "_Manage Contact"
-msgstr "Rename Contact"
+msgstr "_Valdyti Kontaktus"
 
 #: ../data/glade/contact_context_menu.glade.h:23
-#, fuzzy
 msgid "_Rename..."
-msgstr "_Pervadinti"
+msgstr "_Pervadinti..."
 
 #: ../data/glade/contact_context_menu.glade.h:24
 msgid "_Subscription"
 msgstr "_Sutikimas"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/glade/contact_context_menu.glade.h:26
-#, fuzzy
 msgid "_Unignore"
-msgstr "nine"
+msgstr "_Nebeignoruoti"
 
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
@@ -1214,9 +1163,8 @@ msgid "Edit Groups"
 msgstr "Keisti grupę"
 
 #: ../data/glade/esession_info_window.glade.h:1
-#, fuzzy
 msgid "(<b>ESession</b> info)"
-msgstr "<b>Aprašymas</b>"
+msgstr ""
 
 #: ../data/glade/esession_info_window.glade.h:2
 msgid "_Verify"
@@ -1227,9 +1175,8 @@ msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
 #: ../data/glade/features_window.glade.h:3
-#, fuzzy
 msgid "Features"
-msgstr "Serverio teikiamos paslaugos"
+msgstr "Savybės"
 
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
@@ -1283,7 +1230,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Tęsti"
 
@@ -1291,7 +1238,7 @@ msgstr "_Tęsti"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Pranešti, kai failo siuntimas bus baigtas"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Atidaryti katalogą, kuriame yra failas"
 
@@ -1319,7 +1266,7 @@ msgstr ""
 "Asmens eilutė\n"
 "Pokalbio paveiksliukas"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Paryškintas"
 
@@ -1339,11 +1286,11 @@ msgstr "Gajim temų keitimas"
 msgid "Gone"
 msgstr "Dingo"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktyvus"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Pasviręs"
 
@@ -1380,33 +1327,28 @@ msgid "_Background:"
 msgstr "_Fonas:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
 msgid "Change _Nickname..."
-msgstr "Keisti _slapyvardį"
+msgstr "Keisti _Slapyvardį..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
 msgid "Change _Subject..."
-msgstr "Keisti _temą"
+msgstr "Keisti _Temą..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
 msgid "Configure _Room..."
-msgstr "Keisti kambario nustatymus"
+msgstr "Keisti Kambario Nustatymus..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
-#, fuzzy
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
-msgstr "Žy_mėti šį kambarį"
+msgstr "Žy_mės"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
 msgid "_Destroy Room"
 msgstr ""
 
 #: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
 msgid "_Manage Room"
-msgstr "Žymių valdymas"
+msgstr "_Valdyti Kambarį"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:8
 msgid "_Minimize on close"
@@ -1417,9 +1359,8 @@ msgid "Mo_derator"
 msgstr "Mo_deratorius"
 
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#, fuzzy
 msgid "Occupant Actions"
-msgstr "_Valdytojo Veiksmai"
+msgstr "Valdytojo Veiksmai"
 
 #: ../data/glade/gc_occupants_menu.glade.h:3
 msgid "Send _File"
@@ -1472,27 +1413,22 @@ msgid "Subject"
 msgstr "Tema"
 
 #: ../data/glade/history_manager.glade.h:1
-#, fuzzy
 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."
 msgstr ""
-"<big><b>Gajim istorijos žurnalų valdymas</b></big>\n"
-"\n"
-"Galite pasirinkti žurnalą kairėje ir/arba žemiau ieškoti duomenų bazę.\n"
-"\n"
 "<b>ĮSPĖJIMAS:</b>\n"
-"Jei planuojate daryti daug trynimų, įsitikinkite, kad Gajim yra išjungtas. "
-"Stengitės netrinti iš asmenų su kuriais dabar bendraujate."
+"Jei planuojate daryti masinius trynimus, įsitikinkite, kad Gajim yra "
+"išjungtas. Stenkitės netrinti kontaktų su kuriais dabar bendraujate."
 
 #: ../data/glade/history_manager.glade.h:3
-#, fuzzy
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "Gajim Istorijos Žurnalų Valdymas"
+msgstr "<big><b>Gajim Istorijos Žurnalų Valdymas</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Trinti"
 
@@ -1517,7 +1453,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Paieška duomenų bazėje"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Pokalbio istorija"
 
@@ -1529,9 +1465,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-#, fuzzy
 msgid "Search:"
-msgstr "Ieškoti"
+msgstr "Ieškoti:"
 
 #: ../data/glade/history_window.glade.h:6
 #: ../data/glade/zeroconf_information_window.glade.h:10
@@ -1542,7 +1477,7 @@ msgstr "_Registruoti pokalbio istoriją"
 msgid "Bookmark this room"
 msgstr ""
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
@@ -1569,8 +1504,8 @@ msgstr "Nesenai:"
 msgid "Room:"
 msgstr "Kambarys:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Jungtis"
 
@@ -1598,7 +1533,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Rodyti būklę:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Serveris:"
 
@@ -1607,19 +1542,16 @@ msgid "Title:"
 msgstr "Antraštė:"
 
 #: ../data/glade/manage_pep_services_window.glade.h:1
-#, fuzzy
 msgid "PEP Service Configuration"
-msgstr "Kambario nustatymai"
+msgstr "PEP Paslaugos Konfigūracija"
 
 #: ../data/glade/manage_pep_services_window.glade.h:2
-#, fuzzy
 msgid "_Configure"
-msgstr "_Tęsti"
+msgstr "_Konfigūruoti"
 
 #: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
 msgid "gtk-delete"
-msgstr "Trinti"
+msgstr ""
 
 #: ../data/glade/manage_proxies_window.glade.h:1
 msgid "<b>Properties</b>"
@@ -1630,12 +1562,11 @@ msgid "<b>Settings</b>"
 msgstr "<b>Nustatymai</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
-msgstr "HTTP jungimąsis"
+msgstr ""
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1646,43 +1577,36 @@ msgid "Pass_word:"
 msgstr "_Slaptažodis:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Proksis:"
+msgstr "Proksi _Serveris:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Portas:"
+msgstr "Proksi _Prievadas:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-#, fuzzy
 msgid "Use HTTP prox_y"
-msgstr "_Naudoti proksi"
+msgstr "_Naudoti HTTP proksi"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Naudoti autentifikaciją"
+msgstr "Naudoti proksi _autentikaciją"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
-#, fuzzy
 msgid "_BOSH URL:"
-msgstr "_URL:"
+msgstr ""
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Tipas:"
+msgstr "_Tipas:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
 msgstr "_Naudotojo vardas:"
 
 #: ../data/glade/message_window.glade.h:1
-#, fuzzy
 msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Adds contact to roster"
+msgstr "Įtraukti šį kontaktą į sąrašą (Ctrl+D)"
 
 #: ../data/glade/message_window.glade.h:2
 msgid "Bookmark this room (Ctrl+B)"
@@ -1701,36 +1625,42 @@ msgid "Change your nickname (Ctrl+N)"
 msgstr ""
 
 #: ../data/glade/message_window.glade.h:6
-#, fuzzy
 msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "is paying attention to the conversation"
+msgstr "Pakviesti kontaktus į pokalbį (Ctrl+G)"
 
 #: ../data/glade/message_window.glade.h:7
 msgid "Send a file (Ctrl+F)"
 msgstr ""
 
 #: ../data/glade/message_window.glade.h:8
-#, fuzzy
 msgid "Show a list of emoticons (Alt+M)"
-msgstr "Įterpti emocijų paveiksliuką (Alt+M)"
+msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
-#, fuzzy
 msgid "Show a list of formattings"
-msgstr "Įterpti emocijų paveiksliuką (Alt+M)"
+msgstr "Rodyti formatavimo sąrašą"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Siųsti"
 
@@ -1747,24 +1677,20 @@ msgid "<b>Applications</b>"
 msgstr "<b>Programos</b>"
 
 #: ../data/glade/preferences_window.glade.h:3
-#, fuzzy
 msgid "<b>Auto Status</b>"
-msgstr "<b>Veiksmai</b>"
+msgstr "<b>Automatinė Būklė</b>"
 
 #: ../data/glade/preferences_window.glade.h:4
-#, fuzzy
 msgid "<b>Chat Appearance</b>"
-msgstr "<b>Edit a rule</b>"
+msgstr "<b>Pokalbio Išvaizda</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-#, fuzzy
 msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Pokalbių būklės žymių spalvos</b>"
+msgstr "<b>Pokalbio Eilutės Spalvos</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-#, fuzzy
 msgid "<b>Chat state notifications</b>"
-msgstr "<b>Vizualinis informavimas</b>"
+msgstr "<b>Pokalbio būklės pranešimai</b>"
 
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/glade/preferences_window.glade.h:8
@@ -1772,9 +1698,8 @@ msgid "<b>Custom</b>"
 msgstr "<b>Kitaip</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
-#, fuzzy
 msgid "<b>Font</b>"
-msgstr "<b>Garsai</b>"
+msgstr "<b>Šriftas</b>"
 
 #: ../data/glade/preferences_window.glade.h:10
 msgid "<b>GMail Options</b>"
@@ -1785,23 +1710,20 @@ msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Nustatytosios būklės žinutės</b>"
 
 #: ../data/glade/preferences_window.glade.h:13
-#, fuzzy
 msgid "<b>Privacy</b>"
-msgstr "<i>Privatus Sąrašas</i>"
+msgstr "<i>Privatumas</i>"
 
 #: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:16
-#, fuzzy
 msgid "<b>Status Messages</b>"
-msgstr "<b>Nustatytosios būklės žinutės</b>"
+msgstr "<b>Būklės Žinutės</b>"
 
 #: ../data/glade/preferences_window.glade.h:17
-#, fuzzy
 msgid "<b>Themes</b>"
-msgstr "<b>Savybės</b>"
+msgstr "<b>Temos</b>"
 
 #: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
@@ -1812,9 +1734,8 @@ msgid "Advanced"
 msgstr "Išplėstinis"
 
 #: ../data/glade/preferences_window.glade.h:20
-#, fuzzy
 msgid "Advanced..."
-msgstr "Išplėstinis"
+msgstr "Išplėstinis..."
 
 #: ../data/glade/preferences_window.glade.h:21
 msgid ""
@@ -1844,7 +1765,6 @@ msgid "Ask status message when I:"
 msgstr "Prašyti įvesti būklės žinutę, kai aš:"
 
 #: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1855,24 +1775,32 @@ msgstr ""
 "Automatiškai aptikti, startuojant Gajim\n"
 "Visada naudoti GNOME programas pagal nutylėjimą\n"
 "Visada naudoti KDĘ programas pagal nutylėjimą\n"
-"Visada naudoti XFCE4 programas pagal nutylėjimą\n"
-"Kita"
+"Visada naudoti Xfce programas pagal nutylėjimą\n"
+"Pasirinktinis"
 
 #: ../data/glade/preferences_window.glade.h:33
-#, fuzzy
 msgid "Chat message:"
-msgstr "_Būklės pranešimas:"
+msgstr "Būklės pranešimas:"
 
 #: ../data/glade/preferences_window.glade.h:34
-#, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Startuojant visada tikrinti ar Gajim yra pagrindinis Jabber klientas"
+msgstr "Startuojant tikrinti ar Gajim yra pagrindinis Jabber klientas"
 
 #: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Nustatyti sąsajos spalvą ir šriftą"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Būklės pranešimas:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Contact name"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1881,34 +1809,31 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
-msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+msgstr "Rodyti kontaktų _aktyvumą sąraše"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Rodyti papildomus _el. pašto duomenis"
 
-#: ../data/glade/preferences_window.glade.h:43
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
-msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:45
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
-msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+msgstr "Rodyti kontaktų nuotaikas sąraše"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Rodyti asmenų _būklės žinutes kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1918,7 +1843,7 @@ msgstr ""
 "kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
 "koduotę rodyti pokalbių languose."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1928,7 +1853,7 @@ msgstr ""
 "kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
 "koduotę išsiųsti kitai šaliai."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1936,37 +1861,36 @@ msgstr ""
 "Gajim rodys pranešimus apie ką tik atsijungusius asmenis iššokančiame "
 "langelyje, dešiniajame apatiniame ekrano kampe"
 
-#: ../data/glade/preferences_window.glade.h:51
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
-msgstr "Hides the buttons in group chat window."
+msgstr "Slėpti visus mygtukus pokalbio languose"
 
-#: ../data/glade/preferences_window.glade.h:52
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
-msgstr "Jei pažymėta, Gajim, startuodamas jungsis prie šio pokalbio grupėje"
+msgstr ""
+"Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Jei pažymėsite, Gajim taip pat įtrauks informaciją apie naujo laiško siuntėją"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1974,7 +1898,7 @@ msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1982,64 +1906,54 @@ msgstr ""
 "Jei pažymėta, Gajim rodys žiničių būkles žemiau kontaktinio asmens vardo, "
 "kontaktų sąraše ir pokalbių grupėse"
 
-#: ../data/glade/preferences_window.glade.h:58
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
-"lange"
+msgstr "Jei pažymėta, Gajim rodys kontaktų aktyvumą sąrašo lange"
 
-#: ../data/glade/preferences_window.glade.h:59
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
-"lange"
+msgstr "Jei pažymėta, Gajim rodys kontaktų nuotaiką sąrašo lange"
 
-#: ../data/glade/preferences_window.glade.h:60
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
-"lange"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:64
 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 ""
-"Pažymėkite šį laukelį, tik jei kas nors, kas nėra jūsų kantaktų sąraše rašo "
-"jums nepageidaujamas žinutes. Naudokite atsargiai, nes šis dalykas blokuos "
-"vias žinutes, siunčiamas iš žmonių, kurie nėra Jūsų kontaktų sąraše."
+"Jei pažymėta, Gajim ignoruos visas įeinančias žinutes iš kontaktų, kurie "
+"neįtraukti į jūsų kontaktų sąrašą. Naudokite šią funkciją atsargiai, todėl, "
+"kad negausite jokių žinučių iš žmonių, kurie neįtraukti į jūsų kontaktų "
+"sąrašą."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
-"Jei pažymėsite, Gajim taip pat įtrauks informaciją apie naujo laiško siuntėją"
+"Jei pažymėsite, Gajim parodys pranešimą, kai gausite naują laišką į GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2049,13 +1963,13 @@ msgstr ""
 "(pvz.: asmuo iš MSN protokolo turės atitinkamą MSN paveiksliuką būklei "
 "„prisijungęs“, „nuėjęs“, „užimtas“ atvaizduoti... )"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2063,79 +1977,73 @@ msgstr ""
 "Jei neišjungtas, Gajim automatiškai pakeis tekstines šypsenėles tokias kaip "
 "':)', į atitinkamus animuotus arba statinius paveiksliukus „rožiukus“"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
-msgstr "Vienas žinučių langas:"
+msgstr "_Padaryti žinučių langus kompaktiškus"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Val_dyti..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
-msgstr "Prieigos keitimas"
+msgstr "Pranešimai"
 
-#: ../data/glade/preferences_window.glade.h:75
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
-msgstr "Pranešk man apie asmenius, kurie: "
+msgstr "Pranešti apie _prisijungusius kontaktus"
 
-#: ../data/glade/preferences_window.glade.h:76
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
-msgstr "Pranešk man apie asmenius, kurie: "
+msgstr "Pranešti apie _atsijungusius kontaktus"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Pranešk apie naujus _GMail laiškus"
 
-#: ../data/glade/preferences_window.glade.h:78
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
-msgstr "Asmeninė Informacija"
+msgstr "Asmeniniai Įvykiai"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Groti _garsus"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Parinktys"
 
-#: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
-msgstr "_Rodyti įvykį sistemos dėkle"
+msgstr "Rodyti sisteminį dėklą:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Pr_isijungti"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Atsijungti"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2143,30 +2051,27 @@ msgstr ""
 "Kai kurios žinutės gali turėti formatuotą turinį (pastorinimai, spalvos ir "
 "pan.). Jei pažymėsite, Gajim rodys tiesiog tekstą, be jokių formatavimų."
 
-#: ../data/glade/preferences_window.glade.h:88
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
-msgstr "_Rūšiuoti kontaktus pagal būklę"
+msgstr "Rūšiuoti kontaktus pagal būklę"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Būklė"
 
-#: ../data/glade/preferences_window.glade.h:90
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
-msgstr "Būklės p_iktogramų rinkinys, pagal nutylėjimą:"
+msgstr "Būklės _piktogramų rinkinys:"
 
-#: ../data/glade/preferences_window.glade.h:91
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
-msgstr "Stalled"
+msgstr "Stilius"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2174,7 +2079,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2182,113 +2087,105 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
-msgstr "Naudoti _pernašos paveiksliukus"
+msgstr "Naudoti _pernašos piktogramas"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Naudoti sisteminius nustatymus"
 
-#: ../data/glade/preferences_window.glade.h:101
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
-msgstr "Naujam įvykiui ivykus"
+msgstr "Naujam įvykiui įvykus:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
+msgid "Your message:"
+msgstr "Error message: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "B_efore nickname:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
-msgstr "Automatiškai keisti būklė į nuėjęs, po:"
+msgstr "_Nuėjęs po:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Naršyklė:"
 
-#: ../data/glade/preferences_window.glade.h:104
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "Rodyti _pokalbio būklės pranešimus:"
 
-#: ../data/glade/preferences_window.glade.h:105
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
-msgstr "Rožiukai:"
+msgstr "Šyp_senėlės:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Failų menedžeris:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "Žymėti žodžius su _gramatine klaida"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruoti įvykius nuo asmenų nesančių kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:109
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
-msgstr "Ignoruoti formatuotą turinį ateinančioms žinutėms"
-
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "Į_einanti žinutė:"
+msgstr "_Ignoruoti formatuotą turinį įeinančioms žinutėms"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_El. pašto programa:"
 
-#: ../data/glade/preferences_window.glade.h:113
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
-msgstr "Automatiškai keisti būklę į nepasiekamas, po:"
+msgstr "_Nepasiekiamas po:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Išeinanti žinutė:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 
-#: ../data/glade/preferences_window.glade.h:117
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
-msgstr "Rodyti _pokalbio būklės pranešimus:"
+msgstr "_Siųsti pokalbio būklės pranešimus:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Būklės pranešimas:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
-msgstr "Prisijungti prie pokalbio grupėje"
+msgstr "pokalbiuose _grupėje"
 
-#: ../data/glade/preferences_window.glade.h:122
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
-msgstr "Not in roster"
+msgstr "_sąraše"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutės"
 
@@ -2321,9 +2218,8 @@ msgid "All"
 msgstr "Visi"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "visus pagal užsisakymą"
+msgstr "Visi (įskaitant prenumeratas)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2341,7 +2237,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Tvarka:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Privatus sąrašas"
 
@@ -2383,151 +2279,127 @@ msgstr "mano būklės peržiūrai"
 
 #: ../data/glade/profile_window.glade.h:1
 #: ../data/glade/vcard_information_window.glade.h:1
-#, fuzzy
 msgid "<b>Address</b>"
-msgstr "<b>Add a rule</b>"
+msgstr "<b>Adresas</b>"
 
 #: ../data/glade/profile_window.glade.h:2
-#, fuzzy
 msgid "<b>Avatar:</b>"
-msgstr "Atvaizdas:"
+msgstr "<b>Atvaizdas:</b>"
 
 #: ../data/glade/profile_window.glade.h:3
 #: ../data/glade/vcard_information_window.glade.h:4
-#, fuzzy
 msgid "<b>Birthday:</b>"
-msgstr "Gimtadienis:"
+msgstr "<b>Gimtadienis:</b>"
 
 #: ../data/glade/profile_window.glade.h:4
 #: ../data/glade/vcard_information_window.glade.h:5
-#, fuzzy
 msgid "<b>City:</b>"
-msgstr "<b>Kitaip</b>"
+msgstr "<b>Miestas:</b>"
 
 #: ../data/glade/profile_window.glade.h:5
 #: ../data/glade/vcard_information_window.glade.h:7
-#, fuzzy
 msgid "<b>Company:</b>"
-msgstr "<b>Kitaip</b>"
+msgstr "<b>Kompanija:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
 #: ../data/glade/vcard_information_window.glade.h:9
-#, fuzzy
 msgid "<b>Country:</b>"
-msgstr "<b>Garsai</b>"
+msgstr "<b>Šalis:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
 #: ../data/glade/vcard_information_window.glade.h:10
-#, fuzzy
 msgid "<b>Department:</b>"
-msgstr "Skyrius:"
+msgstr "<b>Skyrius:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
 #: ../data/glade/vcard_information_window.glade.h:11
-#, fuzzy
 msgid "<b>E-Mail:</b>"
-msgstr "El. paštas:"
+msgstr "<b>El. paštas:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
 #: ../data/glade/vcard_information_window.glade.h:12
-#, fuzzy
 msgid "<b>Extra Address:</b>"
-msgstr "Papildomas adresas:"
+msgstr "<b>Papildomas adresas:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
 #: ../data/glade/vcard_information_window.glade.h:14
-#, fuzzy
 msgid "<b>Family:</b>"
-msgstr "Pavardė:"
+msgstr "<b>Pavardė:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
 #: ../data/glade/vcard_information_window.glade.h:15
-#, fuzzy
 msgid "<b>Full Name</b>"
-msgstr "Name"
+msgstr "<b>Pilnas Vardas</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
 #: ../data/glade/vcard_information_window.glade.h:17
-#, fuzzy
 msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgstr "<b>Duotas:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
 #: ../data/glade/vcard_information_window.glade.h:18
-#, fuzzy
 msgid "<b>Homepage:</b>"
-msgstr "Asmeninė svetainė:"
+msgstr "<b>Asmeninė svetainė:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
 #: ../data/glade/vcard_information_window.glade.h:21
-#, fuzzy
 msgid "<b>Middle:</b>"
-msgstr "<b>Add a rule</b>"
+msgstr "<b>Antras:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
 #: ../data/glade/vcard_information_window.glade.h:22
-#, fuzzy
 msgid "<b>Name:</b>"
-msgstr "<b>Savybės</b>"
+msgstr "<b>Vardas:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
 #: ../data/glade/vcard_information_window.glade.h:23
-#, fuzzy
 msgid "<b>Nickname:</b>"
-msgstr "Slapyvardis:"
+msgstr "<b>Slapyvardis:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
 #: ../data/glade/vcard_information_window.glade.h:24
-#, fuzzy
 msgid "<b>Phone No.:</b>"
-msgstr "Tel. Nr.:"
+msgstr "<b>Tel. Nr.:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
 #: ../data/glade/vcard_information_window.glade.h:25
-#, fuzzy
 msgid "<b>Position:</b>"
-msgstr "<b>Sąlygos</b>"
+msgstr "<b>Pareigos:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
 #: ../data/glade/vcard_information_window.glade.h:26
-#, fuzzy
 msgid "<b>Postal Code:</b>"
-msgstr "Pašto kodas:"
+msgstr "<b>Pašto Kodas:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
 #: ../data/glade/vcard_information_window.glade.h:28
-#, fuzzy
 msgid "<b>Prefix:</b>"
-msgstr "<i>Privatus Sąrašas</i>"
+msgstr "<b>Titulas:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
-msgstr "<b>Garsai</b>"
+msgstr "<b>Vaidmuo:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
 #: ../data/glade/vcard_information_window.glade.h:31
-#, fuzzy
 msgid "<b>State:</b>"
-msgstr "<b>Nustatymai</b>"
+msgstr "<b>Valstija:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
 #: ../data/glade/vcard_information_window.glade.h:33
-#, fuzzy
 msgid "<b>Street:</b>"
-msgstr "<b>Nustatymai</b>"
+msgstr "<b>Gatvė:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:37
-#, fuzzy
 msgid "<b>Suffix:</b>"
-msgstr "<b>Garsai</b>"
+msgstr "<b>Sufiksas:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
@@ -2569,8 +2441,8 @@ msgstr "Pašalinti prieigą ir iš Gajim ir iš _serverio"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Trinti"
 
@@ -2589,24 +2461,21 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Trinti"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr ""
 
 #: ../data/glade/roster_window.glade.h:1
-#, fuzzy
 msgid "Add _Contact..."
-msgstr "_Įtraukti asmenį..."
+msgstr "Įtraukti _Kontaktą..."
 
 #: ../data/glade/roster_window.glade.h:2
-#, fuzzy
 msgid "Fea_tures"
-msgstr "Serverio teikiamos paslaugos"
+msgstr "_Savybės"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2625,9 +2494,8 @@ msgid "Profile, A_vatar"
 msgstr "Profilis, At_vaizdas"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Rodyti _Atsijungusius Asmenis"
+msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2643,9 +2511,8 @@ msgid "Show _Roster"
 msgstr "Rodyk _Kontaktų Sąrašą"
 
 #: ../data/glade/roster_window.glade.h:13
-#, fuzzy
 msgid "_Accounts"
-msgstr "Prieiga"
+msgstr "_Prieigos"
 
 #. 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:14
@@ -2657,7 +2524,7 @@ msgstr "_Veiksmai"
 msgid "_Contents"
 msgstr "_Turinys"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Redaguoti"
 
@@ -2678,35 +2545,31 @@ msgid "_Quit"
 msgstr "_Išjungti"
 
 #: ../data/glade/roster_window.glade.h:24
-#, fuzzy
 msgid "_Send Single Message..."
-msgstr "Siųsti ži_nutę..."
+msgstr "_Siųsti Žinutę..."
 
 #: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Rodinys"
 
 #: ../data/glade/search_window.glade.h:1
-#, fuzzy
 msgid "Please wait while retrieving search form..."
-msgstr "Prašome luktelti, kol atsisiųs komandų sąrašas..."
+msgstr "Palaukite, kol atsisiųs paieškos forma..."
 
 #: ../data/glade/search_window.glade.h:2
 msgid "Search"
 msgstr "Ieškoti"
 
 #: ../data/glade/search_window.glade.h:3
-#, fuzzy
 msgid "_Add contact"
-msgstr "Įtraukti _Asmenį"
+msgstr "Įtr_aukti Kontaktą"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
-#, fuzzy
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
-msgstr "Asmens Informacija"
+msgstr "_Informacija"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Ieškoti"
 
@@ -2726,10 +2589,6 @@ msgstr "Registruotis prie"
 msgid "_Cancel"
 msgstr "_Atšaukti"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2799,14 +2658,12 @@ msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
-#, fuzzy
 msgid "Select the contacts you want to synchronise"
-msgstr "JID of the contact that you want to chat with"
+msgstr "Pažymėkite kontaktus kuriuos norėsite sinchronizuoti"
 
 #: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
-#, fuzzy
 msgid "Synchronise : select contacts"
-msgstr "Rodyti _Atsijungusius Asmenis"
+msgstr "Sinchronizuoti : pažymėkite kontaktus"
 
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Mute Sounds"
@@ -2830,54 +2687,45 @@ msgstr "Pokalbiai _Grupėje"
 
 #. Given Name
 #: ../data/glade/vcard_information_window.glade.h:3
-#, fuzzy
 msgid "<b>Ask:</b>"
-msgstr "<b>Veiksmai</b>"
+msgstr "<b>Klausk:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:6
-#, fuzzy
 msgid "<b>Client:</b>"
-msgstr "<b>Kitaip</b>"
+msgstr "<b>Klientas:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>Nustatymai</b>"
+msgstr "<b>Kontakto laikas:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
-#, fuzzy
 msgid "<b>Jabber ID:</b>"
-msgstr "Jabber ID:"
+msgstr "<b>Jabber ID:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:29
-#, fuzzy
 msgid "<b>Resource:</b>"
-msgstr "Šaltinis:"
+msgstr "<b>Šaltinis:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:32
-#, fuzzy
 msgid "<b>Status:</b>"
-msgstr "<b>Nustatymai</b>"
+msgstr "<b>Būklė:</b>"
 
 #. Family Name
 #: ../data/glade/vcard_information_window.glade.h:35
-#, fuzzy
 msgid "<b>Subscription:</b>"
-msgstr "<b>Aprašymas</b>"
+msgstr "<b>Prenumerata:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:38
-#, fuzzy
 msgid "<b>System:</b>"
-msgstr "<b>Kitaip</b>"
+msgstr "<b>Sistema:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Komentarai"
 
 #: ../data/glade/vcard_information_window.glade.h:42
-#, fuzzy
 msgid "Configured avatar:"
-msgstr "Keisti kambario nustatymus"
+msgstr "Nustatytas atvaizdas:"
 
 #: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
@@ -2893,9 +2741,8 @@ msgid "More"
 msgstr "Daugiau"
 
 #: ../data/glade/vcard_information_window.glade.h:49
-#, fuzzy
 msgid "User avatar:"
-msgstr "Atvaizdas:"
+msgstr "Naudotojo atvaizdas:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2948,390 +2795,360 @@ msgstr "Šaltinis:"
 msgid "Status:"
 msgstr "Būklė:"
 
-#: ../src/adhoc_commands.py:268
-#, fuzzy
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
-msgstr "Asmens Informacija"
+msgstr "Atšaukti sutikimą"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Activated"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Value"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(None)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Hidden"
 
-#: ../src/atom_window.py:110
-#, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Jūs gavote naują įrašą:"
+#: ../src/atom_window.py:119
+#, python-format
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Jūs gavote naujų įrašų (ir %d nerodomi):"
+msgstr[1] "Jūs gavote naujų įrašų (ir %d nerodomi):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:74
-#, fuzzy
+#: ../src/chat_control.py:75
 msgid "Breton"
-msgstr "Briton"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
-msgstr "Czech"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
-msgstr "German"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
-msgstr "Greek"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
-msgstr "British"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
-msgstr "Esperanto"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
-msgstr "Spanish"
+msgstr ""
 
-#: ../src/chat_control.py:74
-#, fuzzy
+#: ../src/chat_control.py:75
 msgid "Basque"
-msgstr "Basc"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
-msgstr "French"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
-msgstr "Croatian"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
-msgstr "Italian"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
-msgstr "Norwegian (b)"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
-msgstr "Dutch"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
-msgstr "Norwegian"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
-msgstr "Polish"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
-msgstr "Portuguese"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
-msgstr "Brazilian Portuguese"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
-msgstr "Russian"
+msgstr ""
 
-#: ../src/chat_control.py:74
-#, fuzzy
+#: ../src/chat_control.py:75
 msgid "Serbian"
-msgstr "German"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
-msgstr "Slovak"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
-msgstr "Swedish"
+msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
-msgstr "Chinese (Ch)"
+msgstr ""
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
-msgstr "Spelling language"
+msgstr "Rašybos tikrinimo kalba"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
-msgstr "A connection is not available"
+msgstr ""
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
-msgstr "Your message can not be sent until you are connected."
+msgstr ""
 
-#: ../src/chat_control.py:820
-#, fuzzy
+#: ../src/chat_control.py:861
 msgid "Underline"
-msgstr "nine"
+msgstr "Pabraukimas"
 
-#: ../src/chat_control.py:821
-#, fuzzy
+#: ../src/chat_control.py:862
 msgid "Strike"
-msgstr "Nick"
+msgstr "Perbraukimas"
 
-#: ../src/chat_control.py:844
-#, fuzzy
+#: ../src/chat_control.py:885
 msgid "Font"
-msgstr "Šri_ftas:"
+msgstr "Šriftas"
 
-#: ../src/chat_control.py:853
-#, fuzzy
+#: ../src/chat_control.py:894
 msgid "Clear formating"
-msgstr "Asmens Informacija"
+msgstr "Valyti formatavimą"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
-msgstr ""
+msgstr "Tikrai siųsti failą?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
-#, fuzzy
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
-msgstr "Encryption enabled"
+msgstr "GPG šifravimas įjungtas"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
-msgstr "Not in Roster"
+msgstr "Ne Sąraše"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "Sąrašas aktyvių, baigtų ar sustabdytų failų siuntimų"
+msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
-#, fuzzy
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
-msgstr "Encryption disabled"
+msgstr "GPG šifravimas išjungtas"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
-#, fuzzy
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
-msgstr "Naudoti autentifikaciją"
+msgstr "ir patvirtintas"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
-#, fuzzy
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
-msgstr "Naudoti autentifikaciją"
+msgstr "ir NEpatvirtintas"
 
 #. 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:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
-#, fuzzy
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
-msgstr "[This message is encrypted]"
+msgstr "Ši žinutė šifruota"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
-#, fuzzy
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
-msgstr "Encryption disabled"
+msgstr "E2E šifravimas išjungtas"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
-#, fuzzy
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
-msgstr "[This message is encrypted]"
+msgstr "Ši žinutė NEBUVO šifruota"
 
-#: ../src/chat_control.py:1965
-#, fuzzy
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
-msgstr "[This message is encrypted]"
+msgstr "Ši žinutė buvo šifruota"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3339,47 +3156,47 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
-#, fuzzy, python-format
+#: ../src/chat_control.py:2784
+#, python-format
 msgid "%(name)s is now %(status)s"
-msgstr "%(nick)s is now %(status)s"
+msgstr "%(name)s dabar %(status)s"
 
 #: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is a file but it should be a directory"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
@@ -3442,22 +3259,20 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Groupchats"
 
 #: ../src/common/commands.py:246
-#, fuzzy
 msgid "You left the following groupchats:"
-msgstr "You left the following groupchats:"
+msgstr "Jūs palikote šių grupių pokalbius:"
 
 #: ../src/common/commands.py:258
-#, fuzzy
 msgid "Forward unread messages"
-msgstr " %d unread message"
+msgstr "Persiųsti neskaitytas žinutes"
 
 #: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
@@ -3480,9 +3295,8 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Time in minutes, after which your status changes to away."
 
 #: ../src/common/config.py:82
-#, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
-msgstr "Away as a result of being idle"
+msgstr "$S (Nutolęs, nes nesinaudoja kompiuteriu, daugiau kaip $T min)"
 
 #: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
@@ -3490,12 +3304,11 @@ msgstr ""
 
 #: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
-msgstr "Time in minutes, after which your status changes to not available."
+msgstr ""
 
 #: ../src/common/config.py:85
-#, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
-msgstr "Not available as a result of being idle"
+msgstr "$S (Nepasiekiamas, nes nesinaudoja kompiuteriu daugiau kaip $T min)"
 
 #: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
@@ -3506,9 +3319,8 @@ msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Invalid username"
+msgstr "Įeinančio slapyvardžio spalva."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
@@ -3523,19 +3335,16 @@ msgid "Outgoing text color."
 msgstr ""
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "status message text"
+msgstr "Būklės žinutės teksto spalva."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Invalid username"
+msgstr "Įeinančio slapyvardžio šriftas."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Changing Nickname"
+msgstr "Išeinančio slapyvardžio spalva."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
@@ -3546,9 +3355,8 @@ msgid "Outgoing text font."
 msgstr ""
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "status message text"
+msgstr "Būklės žinutės teksto šriftas."
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3557,12 +3365,11 @@ msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
-#, fuzzy
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
-msgstr "Default"
+msgstr "įprastas"
 
 #: ../src/common/config.py:112
 msgid "Language used by speller"
@@ -3584,9 +3391,6 @@ msgid ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
-"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'."
 
 #: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
@@ -3758,13 +3562,10 @@ msgid ""
 msgstr ""
 
 #: ../src/common/config.py:192
-#, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
 
 #: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -3912,7 +3713,6 @@ msgstr ""
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:244
-#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3923,13 +3723,6 @@ msgid ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 msgstr ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
 
 #: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -3940,9 +3733,8 @@ msgid "If True, pressing the escape key closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
 #: ../src/common/config.py:247
-#, fuzzy
 msgid "Hides the buttons in chat windows."
-msgstr "Hides the buttons in group chat window."
+msgstr "Paslėps mygtukus pokalbių languose."
 
 #: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
@@ -3969,16 +3761,14 @@ msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
 #: ../src/common/config.py:253
-#, fuzzy
 msgid "Smooth scroll message in conversation window"
-msgstr "Išsiųsti žinutę ir uždaryti langą"
+msgstr "Lygus žinutės slinkimas pokalbio lange"
 
 #: ../src/common/config.py:254
-#, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
-msgstr "List of colours that will be used to colour nicknames in group chats."
+msgstr ""
 
 #: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
@@ -3993,22 +3783,16 @@ msgstr ""
 "string means we never show the dialogue."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Should we show the confirm metacontacts creation dialogue or not? Empty "
-"string means we never show the dialogue."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Should we show the confirm metacontacts creation dialogue or not? Empty "
-"string means we never show the dialogue."
 
 #: ../src/common/config.py:259
 msgid ""
@@ -4029,13 +3813,10 @@ msgstr ""
 "passwords."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
 
 #: ../src/common/config.py:262
 msgid ""
@@ -4137,10 +3918,9 @@ msgid ""
 msgstr ""
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
-msgstr "If False, you will no longer see the avatar in the chat window."
+msgstr ""
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4193,7 +3973,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4201,125 +3981,125 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' or ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4327,107 +4107,103 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Wrong host"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
-msgstr "Register to %s"
+msgstr "Registracija sėkminga"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
-msgstr "Connection Failed"
+msgstr "Registracija nesėkminga"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
-#, fuzzy
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
-msgstr "Extension not supported"
+msgstr "Nematomumo funkcijos nėra"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
@@ -4435,77 +4211,77 @@ msgstr "Nickname not allowed: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2295
+#, python-format
 msgid "You are banned from group chat %s."
-msgstr "You are banned from this group chat."
+msgstr "Jūs esate išmestas iš grupės pokalbio %s."
 
-#: ../src/common/connection_handlers.py:2310
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2301
+#, python-format
 msgid "Group chat %s does not exist."
-msgstr "Such group chat does not exist."
+msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:2316
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2307
+#, python-format
 msgid "Your registered nickname must be used in group chat %s."
-msgstr "Your registered nickname must be used."
+msgstr ""
+"Jūsų užregistruotas slapyvardis turi būti naudojamas grupės pokalbyje %s."
 
-#: ../src/common/connection_handlers.py:2320
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2311
+#, python-format
 msgid "You are not in the members list in groupchat %s."
-msgstr "You are not in the members list."
+msgstr "Jūs estate grupės pokalbio %s narių sąraše."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
-#, fuzzy
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
-msgstr "Authorisation has been removed"
+msgstr "Kambarys buvo sunaikintas"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4531,9 +4307,8 @@ msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
 #: ../src/common/connection.py:72
-#, fuzzy
 msgid "Unable to decode issuer public key"
-msgstr "Unable to load idle module"
+msgstr "Nepavyksta iškoduoti siuntėjo viešojo rakto"
 
 #: ../src/common/connection.py:73
 msgid "Certificate signature failure"
@@ -4604,9 +4379,8 @@ msgid "Certificate revoked"
 msgstr ""
 
 #: ../src/common/connection.py:90
-#, fuzzy
 msgid "Invalid CA certificate"
-msgstr "Invalid username"
+msgstr "Blogas CA sertifikatas"
 
 #: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
@@ -4644,188 +4418,182 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr ""
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr ""
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tema: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:290
-#, fuzzy, python-format
+#: ../src/common/connection.py:734
+#, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "Transport %s answered wrongly to register request: %s"
+msgstr ""
+"Serveris %(name)s atsiuntė blogą atsakymą į registravimo užklausą: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:353
-#, fuzzy, python-format
+#: ../src/common/connection.py:797
+#, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr "Transport %s answered wrongly to register request: %s"
+msgstr ""
+"Pernaša %(name)s atsiuntė klaidingą atsakymą į registravimo užklausą: %"
+"(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Saved in: %s"
+msgstr "Serveris atsakė: %s"
 
-#: ../src/common/connection.py:655
-#, fuzzy
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
-msgstr "Connection Failed"
+msgstr "Nepavyko prisijungti prie proksi"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
-#, fuzzy, python-format
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#, python-format
 msgid "Could not connect to account %s"
-msgstr "Could not connect to \"%s\""
+msgstr "Nepavyko prisijungti prie %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
-#, fuzzy, python-format
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "Connection with account \"%s\" has been lost"
+msgstr "Prarastas ryšys su %s. Jungiamasi iš naujo."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:863
-#, fuzzy, python-format
+#: ../src/common/connection.py:1301
+#, 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 ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
-
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "It is not possible to send empty files"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[This message is *encrypted* (See :JEP:`27`]"
 
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Subject: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Rename Contact"
+msgstr "Siųsti kontaktus:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Connection Failed"
+msgstr "Išsiregistruoti nepavyko"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Observers"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Not in roster"
 
@@ -4848,9 +4616,8 @@ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 
 #: ../src/common/exceptions.py:47
-#, fuzzy
 msgid "Database cannot be read."
-msgstr "Account name cannot be empty."
+msgstr "Negalima nuskaityti duomenų bazės."
 
 #: ../src/common/exceptions.py:55
 msgid "Service not available: Gajim is not running, or remote_control is False"
@@ -4871,182 +4638,182 @@ msgstr ""
 
 #: ../src/common/fuzzyclock.py:38
 msgid "twelve"
-msgstr "twelve"
+msgstr "dvylika"
 
 #: ../src/common/fuzzyclock.py:38
 msgid "one"
-msgstr "one"
+msgstr "vienas"
 
 #: ../src/common/fuzzyclock.py:38
 msgid "two"
-msgstr "two"
+msgstr "du"
 
 #: ../src/common/fuzzyclock.py:38
 msgid "three"
-msgstr "three"
+msgstr "trys"
 
 #: ../src/common/fuzzyclock.py:38
 msgid "four"
-msgstr "four"
+msgstr "keturi"
 
 #: ../src/common/fuzzyclock.py:39
 msgid "five"
-msgstr "five"
+msgstr "penki"
 
 #: ../src/common/fuzzyclock.py:39
 msgid "six"
-msgstr "six"
+msgstr "šeši"
 
 #: ../src/common/fuzzyclock.py:39
 msgid "seven"
-msgstr "seven"
+msgstr "septyni"
 
 #: ../src/common/fuzzyclock.py:39
 msgid "eight"
-msgstr "eight"
+msgstr "aštuoni"
 
 #: ../src/common/fuzzyclock.py:39
 msgid "nine"
-msgstr "nine"
+msgstr "devyni"
 
 #: ../src/common/fuzzyclock.py:39
 msgid "ten"
-msgstr "ten"
+msgstr "dešimt"
 
 #: ../src/common/fuzzyclock.py:40
 msgid "eleven"
-msgstr "eleven"
+msgstr "vienuolika"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
 #. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "%(0)s o'clock"
-msgstr "%(0)s o'clock"
+msgstr "%(0)s"
 
 #: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "five past %(0)s"
-msgstr "five past %(0)s"
+msgstr "penkios po %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "ten past %(0)s"
-msgstr "ten past %(0)s"
+msgstr "dešimt po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "quarter past %(0)s"
-msgstr "quarter past %(0)s"
+msgstr "ketvirtis po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty past %(0)s"
-msgstr "twenty past %(0)s"
+msgstr "dvylika po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty five past %(0)s"
-msgstr "twenty five past %(0)s"
+msgstr "dvidešimt penkios po %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "half past %(0)s"
-msgstr "half past %(0)s"
+msgstr "pusė %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "twenty five to %(1)s"
-msgstr "twenty five to %(1)s"
+msgstr "be dvidešimt penkių %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "twenty to %(1)s"
-msgstr "twenty to %(1)s"
+msgstr "be dvylikos %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
 #, python-format
 msgid "quarter to %(1)s"
-msgstr "quarter to %(1)s"
+msgstr "be penkiolikos %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
 #, python-format
 msgid "ten to %(1)s"
-msgstr "ten to %(1)s"
+msgstr "be dešimt %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
 #, python-format
 msgid "five to %(1)s"
-msgstr "five to %(1)s"
+msgstr "be penkių %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
 #, python-format
 msgid "%(1)s o'clock"
-msgstr "%(1)s o'clock"
+msgstr "%(1)s"
 
 #: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
-msgstr "Night"
+msgstr "Naktis"
 
 #: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
-msgstr "Early morning"
+msgstr ""
 
 #: ../src/common/fuzzyclock.py:49
 msgid "Morning"
-msgstr "Morning"
+msgstr "Rytas"
 
 #: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
-msgstr "Almost noon"
+msgstr ""
 
 #: ../src/common/fuzzyclock.py:50
 msgid "Noon"
-msgstr "Noon"
+msgstr ""
 
 #: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
-msgstr "Afternoon"
+msgstr ""
 
 #: ../src/common/fuzzyclock.py:50
 msgid "Evening"
-msgstr "Evening"
+msgstr "Vakaras"
 
 #: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
-msgstr "Late evening"
+msgstr ""
 
 #: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
-msgstr "Start of week"
+msgstr ""
 
 #: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
-msgstr "Middle of week"
+msgstr ""
 
 #: ../src/common/fuzzyclock.py:54
 msgid "End of week"
-msgstr "End of week"
+msgstr ""
 
 #: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
-msgstr "Weekend!"
+msgstr ""
 
 #: ../src/common/helpers.py:140
 msgid "Invalid character in username."
-msgstr "Invalid character in username."
+msgstr ""
 
 #: ../src/common/helpers.py:145
 msgid "Server address required."
-msgstr "Server address required."
+msgstr ""
 
 #: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
-msgstr "Invalid character in hostname."
+msgstr ""
 
 #: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
-msgstr "Invalid character in resource."
+msgstr ""
 
 #: ../src/common/helpers.py:195
 msgid "_Busy"
@@ -5072,7 +4839,7 @@ msgstr "Laisvas Pokalbiams"
 msgid "_Available"
 msgstr "_Prisijungęs"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Prisijungęs"
 
@@ -5190,77 +4957,77 @@ msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
-#, fuzzy, python-format
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
-msgstr[0] "Siųsti žinutę"
-msgstr[1] "Siųsti žinutę"
+msgstr[0] "%d žinutė laukia"
+msgstr[1] "%d žinutės laukia"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5276,722 +5043,670 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
 #: ../src/common/passwords.py:123
 #, fuzzy, python-format
 msgid "XMPP account %s@%s"
-msgstr "of account %s"
+msgstr "XMPP prieiga %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
-#, fuzzy
+#: ../src/common/pep.py:33
 msgid "Aroused"
-msgstr "sustabdytas"
+msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
-#, fuzzy
+#: ../src/common/pep.py:35
 msgid "Bored"
-msgstr "Paryškintas"
+msgstr ""
 
-#: ../src/common/pep.py:39
-#, fuzzy
+#: ../src/common/pep.py:36
 msgid "Brave"
-msgstr "Turiu "
+msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
-#, fuzzy
+#: ../src/common/pep.py:38
 msgid "Cautious"
-msgstr "Chats"
+msgstr ""
 
-#: ../src/common/pep.py:42
-#, fuzzy
+#: ../src/common/pep.py:39
 msgid "Cold"
-msgstr "Paryškintas"
+msgstr ""
 
-#: ../src/common/pep.py:43
-#, fuzzy
+#: ../src/common/pep.py:40
 msgid "Confident"
-msgstr "_Turinys"
+msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
-#, fuzzy
+#: ../src/common/pep.py:42
 msgid "Contemplative"
-msgstr "Completed"
+msgstr ""
 
-#: ../src/common/pep.py:46
-#, fuzzy
+#: ../src/common/pep.py:43
 msgid "Contented"
-msgstr "_Turinys"
+msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
-#, fuzzy
+#: ../src/common/pep.py:46
 msgid "Creative"
-msgstr "Deactivated"
+msgstr ""
 
-#: ../src/common/pep.py:50
-#, fuzzy
+#: ../src/common/pep.py:47
 msgid "Curious"
-msgstr "uri"
+msgstr ""
 
-#: ../src/common/pep.py:51
-#, fuzzy
+#: ../src/common/pep.py:48
 msgid "Dejected"
-msgstr "Trinti"
+msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
-#, fuzzy
+#: ../src/common/pep.py:50
 msgid "Disappointed"
-msgstr "Contact Disconnected"
+msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
-#, fuzzy
+#: ../src/common/pep.py:52
 msgid "Dismayed"
-msgstr "Disabled"
+msgstr ""
 
-#: ../src/common/pep.py:56
-#, fuzzy
+#: ../src/common/pep.py:53
 msgid "Distracted"
-msgstr "Disabled"
+msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:59
-#, fuzzy
+#: ../src/common/pep.py:56
 msgid "Excited"
-msgstr "Activated"
+msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
-#, fuzzy
+#: ../src/common/pep.py:61
 msgid "Grumpy"
-msgstr "Group"
+msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
-#, fuzzy
+#: ../src/common/pep.py:65
 msgid "Hot"
-msgstr "_Hostas:"
+msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
-#, fuzzy
+#: ../src/common/pep.py:70
 msgid "Impressed"
-msgstr "message"
+msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
-#, fuzzy
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
-msgstr "Activated"
+msgstr ""
 
-#: ../src/common/pep.py:79
-#, fuzzy
+#: ../src/common/pep.py:76
 msgid "Invincible"
-msgstr "Nematomas"
+msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
-#, fuzzy
+#: ../src/common/pep.py:78
 msgid "Lonely"
-msgstr "one"
+msgstr ""
 
-#: ../src/common/pep.py:82
-#, fuzzy
+#: ../src/common/pep.py:79
 msgid "Lost"
-msgstr "_Hostas:"
+msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
-#, fuzzy
+#: ../src/common/pep.py:81
 msgid "Mean"
-msgstr "German"
+msgstr ""
 
-#: ../src/common/pep.py:85
-#, fuzzy
+#: ../src/common/pep.py:82
 msgid "Moody"
-msgstr "_Keisti"
+msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
-#, fuzzy
+#: ../src/common/pep.py:85
 msgid "Offended"
-msgstr "Atsijungęs"
+msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
-#, fuzzy
+#: ../src/common/pep.py:88
 msgid "Proud"
-msgstr "Group"
+msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
-#, fuzzy
+#: ../src/common/pep.py:90
 msgid "Relieved"
-msgstr "eleven"
+msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
-#, fuzzy
+#: ../src/common/pep.py:93
 msgid "Sad"
-msgstr "Stalled"
+msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
-#, fuzzy
+#: ../src/common/pep.py:95
 msgid "Satisfied"
-msgstr "Paskutinį kartą keista:"
+msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
-#, fuzzy
+#: ../src/common/pep.py:99
 msgid "Sick"
-msgstr "Nick"
+msgstr ""
 
-#: ../src/common/pep.py:103
-#, fuzzy
+#: ../src/common/pep.py:100
 msgid "Sleepy"
-msgstr "Sleeping"
+msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
-#, fuzzy
+#: ../src/common/pep.py:102
 msgid "Stressed"
-msgstr "Gatvė:"
+msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
-#, fuzzy
+#: ../src/common/pep.py:104
 msgid "Surprised"
-msgstr "Subscribed"
+msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
-#, fuzzy
+#: ../src/common/pep.py:107
 msgid "Tired"
-msgstr "Time"
+msgstr ""
 
-#: ../src/common/pep.py:111
-#, fuzzy
+#: ../src/common/pep.py:108
 msgid "Undefined"
-msgstr "nine"
+msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
-#, fuzzy
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
-msgstr "Wrong host"
+msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
-#, fuzzy
+#: ../src/common/pep.py:115
 msgid "Cleaning"
-msgstr "Evening"
+msgstr ""
 
-#: ../src/common/pep.py:119
-#, fuzzy
+#: ../src/common/pep.py:116
 msgid "Cooking"
-msgstr "Kuriama"
+msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
-#, fuzzy
+#: ../src/common/pep.py:120
 msgid "Gardening"
-msgstr "Morning"
+msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
-#, fuzzy
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
-msgstr "visus grupėje"
+msgstr ""
 
-#: ../src/common/pep.py:126
-#, fuzzy
+#: ../src/common/pep.py:123
 msgid "Drinking"
-msgstr "Working"
+msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
-#, fuzzy
+#: ../src/common/pep.py:134
 msgid "Dancing"
-msgstr "Evening"
+msgstr ""
 
-#: ../src/common/pep.py:138
-#, fuzzy
+#: ../src/common/pep.py:135
 msgid "Hiking"
-msgstr "Kicking %s"
+msgstr ""
 
-#: ../src/common/pep.py:139
-#, fuzzy
+#: ../src/common/pep.py:136
 msgid "Jogging"
-msgstr "_Jungtis"
+msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
-#, fuzzy
+#: ../src/common/pep.py:139
 msgid "Skiing"
-msgstr "Working"
+msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
-#, fuzzy
+#: ../src/common/pep.py:141
 msgid "Working out"
-msgstr "Working"
+msgstr ""
 
-#: ../src/common/pep.py:145
-#, fuzzy
+#: ../src/common/pep.py:142
 msgid "Grooming"
-msgstr "room"
+msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
-#, fuzzy
+#: ../src/common/pep.py:146
 msgid "Shaving"
-msgstr "Eating"
+msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
-#, fuzzy
+#: ../src/common/pep.py:152
 msgid "Hanging out"
-msgstr "Changing Subject"
+msgstr ""
 
-#: ../src/common/pep.py:156
-#, fuzzy
+#: ../src/common/pep.py:153
 msgid "Hiding"
-msgstr "Kicking %s"
+msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
-#, fuzzy
+#: ../src/common/pep.py:155
 msgid "Praying"
-msgstr "Eating"
+msgstr ""
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
-#, fuzzy
+#: ../src/common/pep.py:158
 msgid "Thinking"
-msgstr "Working"
+msgstr ""
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:163
-#, fuzzy
+#: ../src/common/pep.py:160
 msgid "Fishing"
-msgstr "Kicking %s"
+msgstr ""
 
-#: ../src/common/pep.py:164
-#, fuzzy
+#: ../src/common/pep.py:161
 msgid "Gaming"
-msgstr "Eating"
+msgstr ""
 
-#: ../src/common/pep.py:165
-#, fuzzy
+#: ../src/common/pep.py:162
 msgid "Going out"
-msgstr "_Atsijungti"
+msgstr ""
 
-#: ../src/common/pep.py:166
-#, fuzzy
+#: ../src/common/pep.py:163
 msgid "Partying"
-msgstr "Eating"
+msgstr ""
 
-#: ../src/common/pep.py:167
-#, fuzzy
+#: ../src/common/pep.py:164
 msgid "Reading"
-msgstr "Reason"
+msgstr ""
 
-#: ../src/common/pep.py:168
-#, fuzzy
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
-msgstr "Reason"
+msgstr ""
 
-#: ../src/common/pep.py:169
-#, fuzzy
+#: ../src/common/pep.py:166
 msgid "Shopping"
-msgstr "Sleeping"
+msgstr ""
 
-#: ../src/common/pep.py:170
-#, fuzzy
+#: ../src/common/pep.py:167
 msgid "Smoking"
-msgstr "Working"
+msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
-#, fuzzy
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
-msgstr "Eating"
+msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
-#, fuzzy
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
-msgstr "I'm watching a movie."
+msgstr ""
 
-#: ../src/common/pep.py:175
-#, fuzzy
+#: ../src/common/pep.py:172
 msgid "Talking"
-msgstr "Eating"
+msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
-#, fuzzy
+#: ../src/common/pep.py:174
 msgid "On the Phone"
-msgstr "I'm on the phone."
+msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
-#, fuzzy
+#: ../src/common/pep.py:176
 msgid "Traveling"
-msgstr "Transferring"
+msgstr ""
 
-#: ../src/common/pep.py:180
-#, fuzzy
+#: ../src/common/pep.py:177
 msgid "Commuting"
-msgstr "Kuriama"
+msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
-#, fuzzy
+#: ../src/common/pep.py:182
 msgid "On a Plane"
-msgstr "Online"
+msgstr ""
 
-#: ../src/common/pep.py:186
-#, fuzzy
+#: ../src/common/pep.py:183
 msgid "On a Train"
-msgstr "Open as _Link"
+msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
-#, fuzzy
+#: ../src/common/pep.py:185
 msgid "Walking"
-msgstr "Working"
+msgstr ""
 
-#: ../src/common/pep.py:190
-#, fuzzy
+#: ../src/common/pep.py:187
 msgid "Coding"
-msgstr "Kuriama"
+msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
-#, fuzzy
+#: ../src/common/pep.py:190
 msgid "Writing"
-msgstr "Working"
+msgstr ""
+
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
 
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
@@ -6014,37 +5729,11 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passphrase was not given"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "You will be connected to %s without OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"To continue sending and receiving messages, you will need to reconnect."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6053,55 +5742,44 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
-#, fuzzy
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
-msgstr "Please check if Avahi is installed."
+msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[This message is encrypted]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
-#, fuzzy
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
-msgstr "Contact is offline. Your message could not be sent."
+msgstr ""
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6113,26 +5791,25 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
-msgstr "Būklės žinutė, pagal nutylėjimą"
+msgstr "Žinutė pagal nutylėjimą"
 
-#: ../src/config.py:405
-#, fuzzy
+#: ../src/config.py:392
 msgid "Enabled"
-msgstr "Įjungti"
+msgstr "Įjungtas"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6141,69 +5818,68 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
-msgstr "OpenPGP is not usable in this computer"
+msgstr ""
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6211,146 +5887,143 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1856
-#, fuzzy
+#: ../src/config.py:1921
 msgid "Rename Account"
-msgstr "Prieigų valdymas"
+msgstr "Pervadinti Prieigą"
 
-#: ../src/config.py:1857
-#, fuzzy, python-format
+#: ../src/config.py:1922
+#, python-format
 msgid "Enter a new name for account %s"
-msgstr "Enter a new name for group %s"
+msgstr "Įveskite naują prieigos %s pavadinimą"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "A Jabber ID must be in the form \"user@servername\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "There was a problem retrieving your OpenPGP secret keys."
+msgstr ""
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "You must create your account before editing your personal information."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Without a connection, you can not edit your personal information."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "To change the account name, you must be disconnected."
+msgstr ""
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Please rename or remove it before enabling link-local messaging."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6358,11 +6031,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6370,11 +6043,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6382,11 +6055,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6394,8 +6067,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6404,134 +6076,119 @@ msgid ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain)."
 msgstr ""
-"Can be one of the following:\n"
-"1. user@domain/resource (only that resource matches).\n"
-"2. user@domain (any resource matches).\n"
-"3. domain/resource (only that resource matches).\n"
-"4. domain (the domain itself matches, as does any user@domain,\n"
-"domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
-msgstr "Removing %s account"
+msgstr ""
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
-#, fuzzy
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
-msgstr "Invalid username"
+msgstr ""
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Nickname not allowed: %s"
+msgstr ""
 
-#: ../src/config.py:3055 ../src/config.py:3303
-#, fuzzy
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
-msgstr "Invalid username"
+msgstr ""
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Invalid entry"
+msgstr ""
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
-"You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
-"window."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3304
-#, fuzzy
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
-msgstr "Please specify the new nickname you want to use:"
+msgstr ""
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
-#, fuzzy
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
-msgstr "Contact already in roster"
+msgstr ""
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6541,7 +6198,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6549,411 +6206,391 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:3748
-#, fuzzy
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
-msgstr "Next Message Received"
+msgstr ""
 
-#: ../src/config.py:3750
-#, fuzzy
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
-msgstr "Next Message Received"
+msgstr ""
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
-#, fuzzy
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Išjungti"
+msgstr "_Cituoti"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Yesterday"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i days ago"
+msgid_plural "%i days ago"
+msgstr[0] "Yesterday"
+msgstr[1] "Yesterday"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:559
-#, fuzzy
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
-msgstr "Jabber IM Klientas"
+msgstr ""
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:772
-#, fuzzy
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
-msgstr "Status Message"
+msgstr ""
 
-#: ../src/dialogs.py:773
-#, fuzzy
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
-"This name is already used by another of your accounts. Please choose another "
-"name."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Please fill in the data of the contact you want to add in account %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:1018
-#, fuzzy
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
-msgstr "I would like to add you to my roster."
+msgstr ""
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Last but not least, we would like to thank all the package maintainers."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1328
-#, fuzzy, python-format
+#: ../src/dialogs.py:1366
+#, python-format
 msgid ""
 "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 ""
-"You have to install %s dictionary to use spellchecking, or choose another "
-"language by setting the speller_language option."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
-#, fuzzy
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
-msgstr "The group chat Jabber ID has invalid characters."
+msgstr ""
 
-#: ../src/dialogs.py:1859
-#, fuzzy, python-format
+#: ../src/dialogs.py:1948
+#, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
-msgstr "Subscription request for account %s from %s"
+msgstr ""
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Invalid account name"
+msgstr ""
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "You must create an account before you can chat with other contacts."
+msgstr ""
 
-#: ../src/dialogs.py:2060
-#, fuzzy
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
-msgstr "Invalid username"
+msgstr ""
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "The group chat Jabber ID has invalid characters."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s is not the name of a group chat."
 
-#: ../src/dialogs.py:2111
-#, fuzzy
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Without a connection, you can not change your password."
+msgstr ""
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
-#, fuzzy
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
-msgstr "Account \"%s\" is connected to the server"
+msgstr ""
 
-#: ../src/dialogs.py:2159
-#, fuzzy
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
-msgstr "You can not join a group chat unless you are connected."
+msgstr ""
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6962,303 +6599,325 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
-#, fuzzy, python-format
+#: ../src/dialogs.py:2739
+#, python-format
 msgid "Form %s"
-msgstr "I'm %s"
+msgstr ""
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Console"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
-#, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Įtraukti"
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#: ../src/dialogs.py:2958
 #, fuzzy
-msgid "Add"
-msgstr "Adresas"
+msgid "modify"
+msgstr "Keisti"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#: ../src/dialogs.py:2959
 #, fuzzy
+msgid "remove"
+msgstr "_Trinti"
+
+#: ../src/dialogs.py:2987
+#, python-format
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+msgid "Add"
+msgstr "Įtraukti"
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "_Keisti"
+msgstr "Keisti"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Jabber ID:"
+msgstr ""
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Group"
+msgstr "Grupės"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "I would like to add you to my roster."
+msgstr ""
+
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Įtr_aukti Kontaktą"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Removes contact from roster"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3168
-#, fuzzy, python-format
+#: ../src/dialogs.py:3289
+#, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-msgstr "Order: %s, action: %s, type: %s, value: %s"
+msgstr ""
 
-#: ../src/dialogs.py:3173
-#, fuzzy, python-format
+#: ../src/dialogs.py:3294
+#, python-format
 msgid "Order: %(order)s, action: %(action)s"
-msgstr "Order: %s, action: %s"
+msgstr ""
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
-msgstr "<b>Edit a rule</b>"
+msgstr ""
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
-msgstr "<b>Add a rule</b>"
+msgstr ""
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
-msgstr "Privacy Lists for %s"
+msgstr ""
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
-msgstr "Privacy Lists"
+msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
-msgstr "Invalid List Name"
+msgstr ""
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
-msgstr "You must enter a name to create a privacy list."
+msgstr ""
 
-#: ../src/dialogs.py:3528
-#, fuzzy
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
-msgstr "You have not joined a groupchat."
+msgstr ""
 
-#: ../src/dialogs.py:3531
-#, fuzzy
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
-msgstr "$Contact has invited you to group chat %(room_jid)s"
+msgstr ""
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
-msgstr "$Contact has invited you to group chat %(room_jid)s"
+msgstr ""
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
-msgstr "Comment: %s"
+msgstr ""
 
-#: ../src/dialogs.py:3543
-#, fuzzy
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
-msgstr "%s wants to send you a file:"
+msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7266,38 +6925,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7307,31 +6966,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Others"
@@ -7341,24 +7019,24 @@ msgstr "Others"
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7366,343 +7044,323 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "This type of service does not contain any items to browse."
 
-#: ../src/disco.py:702 ../src/disco.py:712
-#, fuzzy
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
-msgstr "Invalid username"
+msgstr ""
 
-#: ../src/disco.py:759
-#, fuzzy, python-format
+#: ../src/disco.py:815
+#, python-format
 msgid "Browsing %(address)s using account %(account)s"
-msgstr "Browsing %s using account %s"
+msgstr ""
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1183
-#, fuzzy
+#: ../src/disco.py:1288
 msgid "_Execute Command"
-msgstr "_Vykdyti komandą..."
+msgstr "_Vykdyti komandą"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1396
-#, fuzzy, python-format
+#: ../src/disco.py:1510
+#, python-format
 msgid "Scanning %(current)d / %(total)d.."
-msgstr "Scanning %d / %d.."
+msgstr ""
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "You can manage your bookmarks via Actions menu in your roster."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:1871
-#, fuzzy
+#: ../src/disco.py:2009
 msgid "Node"
-msgstr "Joks"
+msgstr ""
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
-msgstr "New post"
+msgstr ""
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
-msgstr "_Subscribe"
+msgstr ""
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
-msgstr "_Unsubscribe"
+msgstr ""
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Commands: %s"
+msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "OpenPGP Šifravimas"
+msgstr ""
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
-msgstr "Į_einanti žinutė:"
+msgstr ""
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
-msgstr "History Manager"
+msgstr ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
-#, fuzzy
+#: ../src/features_window.py:68
 msgid "Session Management"
-msgstr "Message Sent"
+msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Passwords do not match"
+msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
-msgstr "Prieigos keitimas"
+msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgid "Automatic status"
 msgstr ""
 
 #: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
-#, fuzzy
-msgid "Automatic status"
-msgstr "_Nustatyti būklei"
-
-#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "Įjungti Open_PGP kodavimą"
+msgstr ""
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
-msgstr "Į_einanti žinutė:"
+msgstr "Šifruojamos pokalbio žinutės."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
-#, fuzzy
+#: ../src/features_window.py:100
 msgid "RST Generator"
-msgstr "Bendros parinktys"
+msgstr "RST Generatorius"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
-#, fuzzy
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 msgid "Feature"
-msgstr "Serverio teikiamos paslaugos"
+msgstr "Savybė"
 
 #: ../src/filetransfers_window.py:76
 msgid "File"
@@ -7716,108 +7374,106 @@ msgstr "Time"
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Size: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
-msgstr "File Transfer Stopped"
+msgstr "Failo siuntimas sustabdytas"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
-#, fuzzy
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
-msgstr "Description: %s"
+msgstr "Aprašymas: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim cannot access this file"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "This file is being used by another process."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7825,33 +7481,33 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "What do you want to do?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Save File as..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7859,32 +7515,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pause"
 
@@ -7898,24 +7554,20 @@ msgid "importing PyGTK failed: %s"
 msgstr ""
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim needs PyGTK 2.6 or above"
+msgstr ""
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+msgstr ""
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim needs GTK 2.6 or above"
+msgstr ""
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim needs GTK 2.6 or above to run. Quiting..."
+msgstr ""
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7954,11 +7606,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7966,433 +7618,28 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Passphrase Required"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Enter GPG key passphrase for account %s."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "You will be connected to %s without OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Wrong Passphrase"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Please retype your GPG passphrase or press Cancel."
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Do you accept this request?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Do you accept this request?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) Authorisation for %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Connection Failed"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "error while sending %s ( %s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Sutikimo užklausimas"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Authorisation accepted"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "The contact \"%s\" has authorised you to see his or her status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Contact \"%s\" removed subscription from you"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Unsubscribe"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Contact with \"%s\" cannot be established"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s is now known as %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s is now %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "A password is required to join this group chat."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "You are currently connected without your OpenPGP key."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Your passphrase is incorrect"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Your passphrase is incorrect"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Do _not ask me again"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnomekeyring is installed but not correctly started (environment variable "
-"probably not correctly set)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "New mail on %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "You have %d new mail conversation"
-msgstr[1] "You have %d new mail conversations"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s wants to send you a file."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Removes contact from roster"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Error reading file:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "You successfully received %(filename)s from %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "File transfer of %(filename)s from %(name)s stopped."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "You successfully sent %(filename)s to %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "File transfer of %(filename)s to %(name)s stopped."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "_Kiekvienai žinutei"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Username Conflict"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Please type a new username for your local account"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Username Conflict"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Prisijungimas"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"You are about to create a metacontact. Are you sure you want to continue?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Encryption disabled"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "You cannot join a group chat while you are invisible"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Could not save your settings and preferences"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8400,49 +7647,49 @@ msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Changes the status of account or accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "message"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8450,47 +7697,41 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Changes the status of account or accounts"
+msgstr ""
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "_Prioritetas:"
+msgstr ""
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Noriu už_registruoti naują prieigą"
+msgstr ""
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"change status of account \"account\". If not specified, try to change status "
-"of all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Shows the chat dialogue so that you can send messages to a contact"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID of the contact that you want to chat with"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8500,29 +7741,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp key"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8532,135 +7773,134 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
-#, fuzzy
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
-msgstr "JID of the contact that will receive the message"
+msgstr ""
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8668,77 +7908,71 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "message contents"
+msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:280
-#, fuzzy
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
-msgstr "Kambarys:"
+msgstr "Kambario JID"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:281
-#, fuzzy
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
-msgstr "Nickname not found: %s"
+msgstr ""
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:282
-#, fuzzy
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
-msgstr "Passwords do not match"
+msgstr ""
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
-#, fuzzy
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
-msgstr "Please check if avahi-daemon is running."
+msgstr ""
 
-#: ../src/gajim-remote.py:292
-#, fuzzy
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
-msgstr "Shows or hides the roster window"
+msgstr ""
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8747,31 +7981,31 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8780,36 +8014,31 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:493
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:505
+#, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:498
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:510
+#, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
-msgstr "Wrong uri"
+msgstr ""
 
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Theme"
 
 #: ../src/gajim_themes_window.py:97
-#, fuzzy
 msgid "You cannot make changes to the default theme"
-msgstr "You cannot delete your current theme"
+msgstr ""
 
 #: ../src/gajim_themes_window.py:98
 msgid "Please create a clean new theme with your desired name."
@@ -8828,288 +8057,677 @@ msgstr "You cannot delete your current theme"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:169
+#, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-msgstr "You are no longer in group chat \"%s\" or \"%s\" has left."
+msgstr ""
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:595
-#, fuzzy
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
-msgstr "Pokalbio istorija"
+msgstr "Pokalbis su "
 
-#: ../src/groupchat_control.py:597
-#, fuzzy
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
-msgstr "Prisijungimas"
+msgstr "Pokalbio tęsinys"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
-#, fuzzy
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
-msgstr "Your new account has been successfully created"
+msgstr ""
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
+#, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
-msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:1290
-#, fuzzy
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
-msgstr "Affiliation:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1433
+#, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
-msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:1400
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1437
+#, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
-msgstr "%(nick)s has been kicked: %(reason)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
-msgstr "%s has left"
+msgstr ""
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
-msgstr "%s has joined the group chat"
+msgstr ""
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s is now %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
-msgstr "Are you sure you want to leave group chat \"%s\"?"
+msgstr ""
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
-"If you close this window, you will be disconnected from this group chat."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Do _not ask me again"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
-msgstr "Changing Subject"
+msgstr ""
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
-msgstr "Please specify the new subject:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
-msgstr "Changing Nickname"
+msgstr ""
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
-msgstr "Please specify the new nickname you want to use:"
+msgstr ""
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1783
+#, python-format
 msgid "Destroying %s"
-msgstr "Description: %s"
+msgstr ""
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
-msgstr "Kicking %s"
+msgstr ""
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
-msgstr "You may specify a reason below:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
-msgstr "Banning %s"
+msgstr ""
 
 #: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
-msgstr "A programming error has been detected"
+msgstr ""
 
 #: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr ""
-"It is probably not fatal, but should be reported to the developers "
-"nonetheless."
 
 #: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
-msgstr "_Report Bug"
+msgstr ""
 
 #: ../src/gtkexcepthook.py:77
 msgid "Details"
-msgstr "Details"
+msgstr ""
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
-msgstr "Error: cannot open %s for reading"
+msgstr ""
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
-msgstr "Error reading file:"
+msgstr ""
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
-msgstr "Error parsing file:"
+msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr "Could not write to %s. Session Management support will not work"
+msgstr ""
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
-msgstr "Gajim is not the default Jabber client"
+msgstr ""
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
-msgstr "Would you like to make Gajim the default Jabber client?"
+msgstr ""
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
-msgstr "Extension not supported"
+msgstr ""
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
+msgstr ""
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
-msgstr "Save Image as..."
+msgstr ""
+
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Do you accept this request?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr ""
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr ""
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr ""
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr ""
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Sutikimo užklausimas"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Authorisation accepted"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "The contact \"%s\" has authorised you to see his or her status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Contact \"%s\" removed subscription from you"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr ""
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Contact with \"%s\" cannot be established"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "You are currently connected without your OpenPGP key."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Your passphrase is incorrect"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "New mail on %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "You have %d new mail conversation"
+msgstr[1] "You have %d new mail conversations"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s wants to send you a file."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr ""
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr ""
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "You successfully received %(filename)s from %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "File transfer of %(filename)s from %(name)s stopped."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "You successfully sent %(filename)s to %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "File transfer of %(filename)s to %(name)s stopped."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Nepavyko iškoduoti žinutės"
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Username Conflict"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Please type a new username for your local account"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s wants to send you a file."
+
+#: ../src/gui_interface.py:1774
 #, fuzzy
+msgid "Voice Chat Request"
+msgstr "File Transfer Request"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Nesaugus ryšys"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "You cannot join a group chat while you are invisible"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Could not save your settings and preferences"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Passphrase Required"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr ""
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "You will be connected to %s without OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr ""
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Please retype your GPG passphrase or press Cancel."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
-msgstr "New Group Chat"
+msgstr ""
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
-msgstr "I would like to add you to my roster"
+msgstr ""
 
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
-msgstr "Cannot find history logs database"
+msgstr ""
 
 #. holds jid
 #: ../src/history_manager.py:161
 msgid "Contacts"
-msgstr "Contacts"
+msgstr ""
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
-msgstr "Date"
+msgstr ""
 
 #. holds nickname
 #: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
-msgstr "Nickname"
+msgstr ""
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
-msgstr "Message"
+msgstr ""
 
 #: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
-"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
-"RUNNING)"
 
 #: ../src/history_manager.py:250
 msgid ""
@@ -9119,200 +8737,189 @@ msgid ""
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, "
-"otherwise click NO.\n"
-"\n"
-"In case you click YES, please wait..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
-msgstr "Exporting History Logs..."
+msgstr ""
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
-msgstr "%(who)s on %(time)s said: %(message)s\n"
+msgstr ""
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Do you really want to delete the logs of the selected contact?"
-msgstr[1] "Do you really want to delete the logs of the selected contacts?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] "Do you really want to delete the selected message?"
-msgstr[1] "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
-msgstr "Conversation History with %s"
+msgstr ""
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
-msgstr "%(nick)s is now %(status)s: %(status_msg)s"
+msgstr ""
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Error message: %s"
+msgstr ""
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
-msgstr "Status is now: %(status)s: %(status_msg)s"
+msgstr ""
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
-msgstr "Status is now: %(status)s"
+msgstr ""
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
-#, fuzzy
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
-msgstr "Could not load image"
+msgstr ""
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "You are not connected to the server"
+msgstr ""
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Do you really want to delete the selected message?"
+msgstr ""
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
-#, fuzzy, python-format
+#: ../src/notify.py:291
+#, python-format
 msgid "Messaged by %(nickname)s"
-msgstr "New Message from %(nickname)s"
+msgstr ""
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
-msgstr "New Message from %(nickname)s"
+msgstr ""
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:568
 msgid "Ignore"
-msgstr "nine"
+msgstr ""
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
-#, fuzzy
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
-msgstr "File path"
+msgstr ""
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
-#, fuzzy
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
-msgstr "Such group chat does not exist."
+msgstr ""
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Without a connection you can not publish your contact information."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9320,46 +8927,51 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "You will be connected to %s without OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9367,405 +8979,369 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Are you sure you want to leave group chat \"%s\"?"
+msgstr ""
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2351
-#, fuzzy
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
-msgstr "You must read them before removing this transport."
+msgstr ""
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
-msgstr "Transport \"%s\" will be removed"
+msgstr ""
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
-"You will no longer be able to send and receive messages from contacts using "
-"this transport."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
-msgstr "Transports will be removed"
+msgstr ""
 
-#: ../src/roster_window.py:2600
-#, fuzzy, python-format
+#: ../src/roster_window.py:2589
+#, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr ""
-"You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
-"You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
-msgstr "Rename Contact"
+msgstr ""
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
-msgstr "Enter a new nickname for contact %s"
+msgstr ""
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
-msgstr "Rename Group"
+msgstr ""
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
-msgstr "Enter a new name for group %s"
+msgstr ""
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
-msgstr "Remove Group"
+msgstr ""
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
-msgstr "Do you want to remove group %s from the roster?"
+msgstr ""
 
-#: ../src/roster_window.py:2800
-#, fuzzy
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
-msgstr "Remove also all contacts in this group from your roster"
+msgstr ""
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
-msgstr "Assign OpenPGP Key"
+msgstr ""
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
-msgstr "Select a key to apply to the contact"
+msgstr ""
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
-msgstr "Contact \"%s\" will be removed from your roster"
+msgstr ""
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr ""
-"By removing this contact you also remove authorisation resulting in him or "
-"her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
-#, fuzzy
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
-msgstr "What do you want to do?"
+msgstr ""
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr ""
-"By removing this contact you also by default remove authorisation resulting "
-"in him or her always seeing you as offline."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
-msgstr "I want this contact to know my status after removal"
+msgstr ""
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
-msgstr "Contacts will be removed from your roster"
+msgstr ""
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
-"By removing these contacts:%s\n"
-"you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
-msgstr "No account available"
+msgstr ""
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
-msgstr "You must create an account before you can chat with other contacts."
+msgstr ""
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
-msgstr "Metacontacts storage not supported by your server"
+msgstr ""
 
-#: ../src/roster_window.py:3879
-#, fuzzy
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
-"Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
-"You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 ""
-"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."
 
-#: ../src/roster_window.py:4081
-#, fuzzy
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
-msgstr "Invalid File"
+msgstr ""
 
-#: ../src/roster_window.py:4092
-#, fuzzy, python-format
+#: ../src/roster_window.py:4112
+#, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
-msgstr[0] "%s wants to send you a file:"
-msgstr[1] "%s wants to send you a file:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Send %s"
+msgstr ""
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
-msgstr "Make %s and %s metacontacts"
+msgstr ""
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
-msgstr "using account %s"
+msgstr ""
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
-msgstr "to %s account"
+msgstr ""
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
-msgstr "using %s account"
+msgstr ""
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
-msgstr "_Manage Bookmarks..."
+msgstr ""
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
-msgstr "of account %s"
+msgstr ""
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
-msgstr "for account %s"
+msgstr ""
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Keisti Būklės Žinutę"
 
-#: ../src/roster_window.py:5066
-#, fuzzy
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
-msgstr "_Publish"
+msgstr ""
 
-#: ../src/roster_window.py:5074
-#, fuzzy
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
-msgstr "Keisti kambario nustatymus"
+msgstr "Konfigūruoti Paslaugas..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
-msgstr "Send Group M_essage"
+msgstr ""
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
-msgstr "Visiems"
+msgstr "Visiems naudotojams"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Visiems prisijungusiems"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
-#, fuzzy
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
-msgstr "Rename Contact"
+msgstr ""
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Redaguoti _Grupes"
 
 #. Send single message
-#: ../src/roster_window.py:5485
-#, fuzzy
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
-msgstr "_Siųsti vieną žinutę"
+msgstr "Siųsti Vieną Žinutę"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Vykdyti Komandą..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
-#, fuzzy
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
-msgstr "Transports"
+msgstr "_Valdyti Pernašą"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
-#, fuzzy
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
-msgstr "Rodyti _Pernašas"
+msgstr "_Keisti Pernašą"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Pervadinti"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "Contact Disconnected"
+msgstr ""
 
-#: ../src/roster_window.py:5637
-#, fuzzy
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
-msgstr "Contact Disconnected"
+msgstr ""
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9775,7 +9351,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9785,150 +9361,143 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Resource: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Last status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:500
-#, fuzzy
+#: ../src/tooltips.py:524
 msgid "Connected"
-msgstr "Prisijungimas"
+msgstr "Prisijungta"
 
-#: ../src/tooltips.py:502
-#, fuzzy
+#: ../src/tooltips.py:526
 msgid "Disconnected"
-msgstr "Contact Disconnected"
+msgstr "Atsijungta"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
-msgstr "Subscription: "
+msgstr ""
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
-msgstr "OpenPGP: "
+msgstr ""
 
-#: ../src/tooltips.py:637
-#, fuzzy
+#: ../src/tooltips.py:618
 msgid "Tune:"
-msgstr "Tipas:"
+msgstr ""
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
-msgstr "Download"
+msgstr ""
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
-msgstr "Upload"
+msgstr ""
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
-msgstr "Type: "
+msgstr ""
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
-msgstr "Transferred: "
+msgstr ""
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
-msgstr "Not started"
+msgstr ""
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
-msgstr "Stopped"
+msgstr ""
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
-msgstr "Completed"
+msgstr ""
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
-msgstr "Paused"
+msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
-msgstr "Stalled"
+msgstr ""
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
-msgstr "Transferring"
+msgstr ""
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
-msgstr "This service has not yet responded with detailed information"
+msgstr ""
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 msgstr ""
-"This service could not respond with detailed information.\n"
-"It is most likely legacy or broken"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
-msgstr "Unknown"
+msgstr ""
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
-msgstr "Unknown"
+msgstr ""
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
-msgstr "Unknown"
+msgstr ""
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:331
-#, fuzzy
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
-msgstr "<b>Programos</b>"
+msgstr ""
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9936,7 +9505,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9944,13 +9513,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9958,18 +9527,45 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "You are waiting contact's answer about your subscription request"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "Į_einanti žinutė:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Išeinanti žinutė:"
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP passphrase was not given"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[This message is encrypted]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i days ago"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Add Special _Notification"
 
@@ -10564,9 +10160,6 @@ msgstr " resource with priority "
 #~ msgid "A_fter nickname:"
 #~ msgstr "A_fter nickname:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "B_efore nickname:"
-
 #~ msgid "_After time:"
 #~ msgstr "_After time:"
 
diff --git a/po/nb.po b/po/nb.po
index af4dea71f..b0ae93387 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,10 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-19 23:56+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
-"Language-Team:  <>\n"
+"Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -92,7 +92,7 @@ msgstr "<b>Vennligst velg en server</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -103,9 +103,8 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Bruk autentisering"
+msgstr "Anon_ym autentisering"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -279,9 +278,9 @@ msgstr "Rediger Personlig Informasjon..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -290,9 +289,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Generelle"
 
@@ -351,21 +350,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Ingen"
 
@@ -471,18 +470,16 @@ msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
-msgstr "_Justér etter status"
+msgstr "J_ustér etter status"
 
 #: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Kontoer"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Bruk autentisering"
+msgstr "Anonym autentisering"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -493,9 +490,8 @@ msgstr ""
 "usikker tilkobling"
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
-msgstr "K_oble til når Gajim starter"
+msgstr "Ko_ble til når Gajim starter"
 
 #: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
@@ -522,8 +518,8 @@ msgstr ""
 "Du kan også vurdere å endre mulige brannmur innstillinger."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -537,57 +533,47 @@ msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
-msgstr "Send hold-i-live meldinger"
+msgstr "Send _hold-i-live pakker"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
-msgstr "Synk_roniser konto status med global status"
+msgstr "Synkroni_ser konto status med global status"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use G_PG Agent"
-msgstr "Bruk GPG _Agent"
+msgstr "Bruk G_PG Agent"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
-msgstr "Bruk egendefinert maskinnavn/port"
+msgstr "Bruk egen_definert maskinnavn/port"
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Bruk egendefinert port:"
+msgstr "Bruk egen_definert port:"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "Rediger Personlig Informasjon..."
+msgstr "_Rediger Personlig Informasjon..."
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Slå på"
+msgstr "_Slå på"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
 msgstr "_Maskinnavn:"
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Behandle..."
+msgstr "_Behandle..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
 msgstr "_Port:"
 
@@ -596,13 +582,12 @@ msgid "_Warn before using an insecure connection"
 msgstr "_Advar før benyttelse av en usikker tilkobling"
 
 #: ../data/glade/accounts_window.glade.h:63
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
-msgstr "bruk HTTP_PROXY system variabel"
+msgstr "_bruk HTTP_PROXY system variabel"
 
 #: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
-msgstr "gtk-tilføy"
+msgstr "legg til"
 
 #: ../data/glade/accounts_window.glade.h:65
 #: ../data/glade/features_window.glade.h:4
@@ -945,7 +930,7 @@ msgstr "Sist endret:"
 msgid "New entry received"
 msgstr "Ny hendelse motatt"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Du har mottatt en ny inntreden:"
 
@@ -989,11 +974,11 @@ msgstr "Skriv inn nytt passord:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Skriv inn din nye status melding:</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Aktivitet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Humør:"
 
@@ -1073,9 +1058,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Tilegn Open_PGP Nøkkel..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Kjør Kommando..."
+msgstr "K_jør Kommando..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1083,8 +1067,8 @@ msgstr "Rediger _Grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -1097,8 +1081,8 @@ msgid "Remo_ve"
 msgstr "_Fjern"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
@@ -1131,8 +1115,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Blokker"
 
@@ -1143,7 +1127,7 @@ msgstr "_Forby han/henne å se min status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Historie"
 
@@ -1164,8 +1148,8 @@ msgid "_Subscription"
 msgstr "_Abonnement"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Frigi"
 
@@ -1253,7 +1237,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -1261,7 +1245,7 @@ msgstr "_Fortsett"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
 
@@ -1289,7 +1273,7 @@ msgstr ""
 "Kontakt rad\n"
 "Samtale Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Fet"
 
@@ -1309,11 +1293,11 @@ msgstr "Gajim Tema Valg"
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1361,7 +1345,7 @@ msgstr "Endre _Tittel..."
 msgid "Configure _Room..."
 msgstr "Konfigurer _Rom..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Bokmerke"
 
@@ -1449,8 +1433,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Historikk og Logg Behandler</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Slett"
 
@@ -1480,7 +1465,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Søk Databasen"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
@@ -1504,11 +1489,10 @@ msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "_Bokmerke dette rommet (Ctrl+B)"
+msgstr "Bokmerke dette rommet"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
@@ -1535,8 +1519,8 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1564,7 +1548,7 @@ msgstr "Minimer ved Automatisk Deltakelse"
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1582,7 +1566,7 @@ msgstr "_Konfigurer"
 
 #: ../data/glade/manage_pep_services_window.glade.h:3
 msgid "gtk-delete"
-msgstr "gtk-delete"
+msgstr "delete"
 
 #: ../data/glade/manage_proxies_window.glade.h:1
 msgid "<b>Properties</b>"
@@ -1593,14 +1577,14 @@ msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
 msgstr ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1611,34 +1595,28 @@ msgid "Pass_word:"
 msgstr "Pass_ord:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgstr "Proxy _Host:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-#, fuzzy
 msgid "Use HTTP prox_y"
-msgstr "_Bruk proxy"
+msgstr "Bruk HTTP prox_y"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Bruk autentisering"
+msgstr "Bruk proxy aut_entisering"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
-#, fuzzy
 msgid "_BOSH URL:"
-msgstr "_URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Skriv:"
+msgstr "_Skriv:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
@@ -1677,22 +1655,30 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Vis en liste over uttrykksikon (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
-#, fuzzy
 msgid "Show a list of formattings"
-msgstr "Vis en liste over uttrykksikon (Alt+M)"
+msgstr "Vis en liste over formatteringer"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Vis kontaktens profil (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Send"
 
@@ -1790,7 +1776,7 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:26
 msgid "Allow sound when I'm _busy"
-msgstr ""
+msgstr "Tillat lys når jeg er _opptatt"
 
 #: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
@@ -1823,6 +1809,16 @@ msgid "Configure color and font of the interface"
 msgstr "Konfigurer farge og font for grensesnittet"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Samtale melding:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Kontakt navn"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1836,31 +1832,31 @@ msgstr ""
 "Frakoblet kontaktliste med samtaler gruppert etter konto\n"
 "Frakoblet kontaktliste med samtaler gruppert etter type"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Vis _aktivitet til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis _sanger til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1870,7 +1866,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1880,7 +1876,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1888,11 +1884,11 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Gjem alle knapper i samtale vinduer"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1900,20 +1896,20 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Dersom valgt vil Gajim endre status til Borte når maskinen ikke brukes."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1921,7 +1917,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1929,7 +1925,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1937,25 +1933,25 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise aktivitet for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise sanger som kontakter spiller i kontaktliste "
 "vinduet"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1965,7 +1961,7 @@ msgstr ""
 "Dersom ikke noe språk er valgt med høyreklikking i feltet vil standard "
 "språkvalg brukes for denne kontakten eller gruppesamtale."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1975,7 +1971,7 @@ msgstr ""
 "kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
 "kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1985,14 +1981,14 @@ msgstr ""
 "husk at når man bruker E2E kryptering må den andre parten være enig i at "
 "logging er OK, ellers vil ikke beskjeder logges."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 "Dersom valgt vil Gajim vise en melding når en ny e-post mottas fra GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2001,7 +1997,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2009,7 +2005,7 @@ msgstr ""
 "Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
 "beskjed vil benyttes isteden."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2017,50 +2013,53 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Logg _krypterte samtale sesjoner"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Gj_ør meldings vinduet kompakt"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Aldri\n"
+"Bare når hendelser venter\n"
+"Alltid"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Kunngjøringer"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Alarmér om nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Personlige Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2070,24 +2069,23 @@ msgstr ""
 "Varsle meg om det\n"
 "Vis bare i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
-msgstr "_Vis hendelse i systemstatusfeltet"
+msgstr "Vis systemstatus:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2095,28 +2093,27 @@ msgstr ""
 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
 "valgt vil Gajim kun vise rå meldings tekst."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Standard _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2124,10 +2121,11 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 "Automatisk borte status melding. Dersom tom vil Gajim ikke endre gjeldende "
-"status melding"
+"status melding\n"
+"$S byttes ut av tidligere status melding\n"
+"$T byttest ut av automatisk-borte tidsavbrudd"
 
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2135,105 +2133,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Automatisk ikke tilgjengelig meldingen. Dersom tom vil Gajim ikke endre "
-"gjeldende status melding"
+"gjeldende status melding\n"
+"$S vil byttes ut av forrige status melding\n"
+"$T vil byttes ut av automatisk-ikke-tilgjengelig tidsavbrudd"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Bruk _transport ikoner"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Bruk systemets _standardinstillinger"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Når en ny hendelse blir motatt:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Feil melding: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "F_ør kallenavn:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "_Borte etter:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "_Vis samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Innkommende melding:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "_Ikke tilgjengelig etter:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Utgående melding:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "_Send Samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "_URL utheving:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "i _gruppe samtale"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutter"
 
@@ -2266,9 +2268,8 @@ msgid "All"
 msgstr "Alle"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "alle etter abonnement"
+msgstr "Alle (inkludert abonnement)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2286,7 +2287,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -2430,7 +2431,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
@@ -2490,8 +2491,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Fjern"
 
@@ -2500,24 +2501,25 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>noen@etsted.no</b> ønsker at du skal <b>legge til</b> noen kontakter i "
+"kontaktlisten din."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Meldings Kropp <brukes ikke, derfor gjemt som standard>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Kontaktliste Element Utveksling"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-lukk"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-lukk"
+msgid "gtk-cancel"
+msgstr "Avbryt"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2544,9 +2546,8 @@ msgid "Profile, A_vatar"
 msgstr "Profil, B_ilde"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Vis _Frakoblede Kontakter"
+msgstr "Vis Bare _Aktive Kontakter"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2575,7 +2576,7 @@ msgstr "_Handlinger"
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Rediger"
 
@@ -2597,7 +2598,7 @@ msgstr "_Avslutt"
 
 #: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
-msgstr "_Send Enkelt Melding..."
+msgstr "_Send Enkeltmelding..."
 
 #: ../data/glade/roster_window.glade.h:26
 msgid "_View"
@@ -2616,11 +2617,11 @@ msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Søk"
 
@@ -2640,10 +2641,6 @@ msgstr "Registrer til:"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2750,9 +2747,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>Stat:</b>"
+msgstr "<b>Kontakt tid:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
@@ -2851,285 +2847,265 @@ msgstr "Ressurs:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Du er i ferd med å eksekvere en kommando. Ønsker du å avbryte den?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Tjenesten sendte ødelagte data"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Tjenesten endret sesjons identifikasjon. "
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktivert"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Deaktivert"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Nummer"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Farge"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Gjemt"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Du har mottatt en ny inntreden:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Du har motatt nye hendelser (og %(count)d vises ikke):"
+msgstr[1] "Du har motatt nye hendelser (og %(count)d vises ikke):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretagner"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Brtisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:820
-#, fuzzy
+#: ../src/chat_control.py:861
 msgid "Underline"
-msgstr "Udefinert"
+msgstr "Understrek"
 
-#: ../src/chat_control.py:821
-#, fuzzy
+#: ../src/chat_control.py:862
 msgid "Strike"
-msgstr "Syk"
+msgstr "Streik"
 
-#: ../src/chat_control.py:844
-#, fuzzy
+#: ../src/chat_control.py:885
 msgid "Font"
-msgstr "_Font:"
+msgstr "Font"
 
-#: ../src/chat_control.py:853
-#, fuzzy
+#: ../src/chat_control.py:894
 msgid "Clear formating"
-msgstr "Kontaktinformasjon"
+msgstr "Fjern formattering"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Dersom du sender en fil til %s, vil han/henne kjenne din ekte Jabber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
-msgstr "ikke i kontaktliste"
+msgstr "Ikke i kontaktliste"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "En liste over aktive, komplette og stoppede fil overføringer"
+msgstr "Denne kontakten støtter ikke filoverføring."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr ""
-
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Ukjent Artist"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Ukjent Tittel"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Ukjent Kilde"
+msgstr "Du må vite det ekte "
 
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
-"fra  <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3137,50 +3113,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
 msgstr "og IKKE autentisert"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3189,23 +3165,23 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3213,25 +3189,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Den følgende meldingen ble kryptert"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3239,15 +3215,15 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3256,7 +3232,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
@@ -3265,23 +3241,23 @@ msgstr "%(name)s er nå %(status)s"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er en fil men skulle ha vært en katalog"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er en katalog men skulle vært en fil"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
@@ -3344,10 +3320,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
@@ -3365,7 +3341,7 @@ msgstr "Alle uleste meldinger har blitt videresendt."
 
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Lag lyd når bruker er opptatt"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3373,7 +3349,7 @@ msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+msgstr "Vis bare tilkoblede og ledig for samtale kontakter i kontaktlisten. "
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3404,51 +3380,47 @@ msgstr "$S vil bli byttet ut med gjeldende status melding, $T av auoxa tid."
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
+"Når skal systemikon vises. Kan være 'aldri', 'ved_hendelse', 'alltid'. "
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Ugyldig kallenavn"
+msgstr "Innkommende kallenavns farge."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Utgående kallenavn farge."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Innkommende tekst farge."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Utgående tekst farge."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "status melding tekst"
+msgstr "Status meldings tekst farge."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Ugyldig kallenavn"
+msgstr "Innkommende kallenavns font."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Endrer Kallenavn"
+msgstr "Utgående kallenavns font."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Innkommende tekst font."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Utgående tekst font."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "status melding tekst"
+msgstr "Status meldings tekst font."
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3457,9 +3429,9 @@ msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "standard"
 
@@ -3546,7 +3518,7 @@ msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
 #: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
-msgstr "Legg * og [n] inn i kontaktliste tittelen?"
+msgstr "Legg til * og [n] inn i kontaktliste tittelen?"
 
 #: ../src/common/config.py:166
 msgid ""
@@ -3564,16 +3536,22 @@ msgstr ""
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
 msgstr ""
+"Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr ""
+"Hvor mange minutter med logg skal man be om når man går inn i en "
+"gruppesamtale. "
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Hvor mange sekunder skal man venter før man prøver en automatisk re-"
+"tilkobling til en samtale som du har blitt frakoblet. Sett til 0 for "
+"deaktiver automatisk re-tilkobling"
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3658,6 +3636,8 @@ 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 ""
+"Spør før lukking av fanet samtalevindu dersom det er kontrol som kan miste "
+"data (samtale, privat samtale, gruppesamtaler vil ikke bli minimert)"
 
 #: ../src/common/config.py:192
 msgid ""
@@ -3898,22 +3878,20 @@ msgstr ""
 "innhold mener at vi aldri viser dialogen."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
-"innhold mener at vi aldri viser dialogen."
+"Skal vi vise bekrefte blokk kontakt dialog eller ikke? Tomt tekststreng "
+"betyr at vi aldri viser dialogen."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
-"innhold mener at vi aldri viser dialogen."
+"Skal vi vise bekrefte egendefinert status dialog eller ikke? Tomt "
+"tekststreng betyr at vi aldri viser dialogen."
 
 #: ../src/common/config.py:259
 msgid ""
@@ -3934,13 +3912,12 @@ msgstr ""
 "konto passord."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
-"konto passord."
+"Dersom True vil Gajim bruke KDE Wallet (dersom kwalletcli er tilgjengelig) "
+"til å lagre konto passord."
 
 #: ../src/common/config.py:262
 msgid ""
@@ -3963,7 +3940,7 @@ msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
-"Dersom Sant vil Gajim skrolle og velge kontakten som sendte deg siste "
+"Dersom True vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
 #: ../src/common/config.py:265
@@ -3971,7 +3948,7 @@ msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
-"Dersom Sant vil Gajim konvertere mellom $$ og $$ til et bilde med dvips og "
+"Dersom True vil Gajim konvertere mellom $$ og $$ til et bilde med dvips og "
 "konvertere før innsetting i et samtale vindu."
 
 #: ../src/common/config.py:266
@@ -3990,7 +3967,7 @@ msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
-"Dersom Sant vil kunngjøringsvinduer fra notification-deamon bli festet til "
+"Dersom True vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
 #: ../src/common/config.py:269
@@ -4006,29 +3983,35 @@ msgstr ""
 "er større."
 
 #: ../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)"
 msgstr ""
 "Lovlige uri skjema. Bare skjema i denne listen vil bli aksepterte som en "
-"\"ekte\" uri."
+"\"ekte\" uri. (mailto og xmpp håndteres separat)"
 
 #: ../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 ""
+"Spør om frakoblet status melding til alle frakoblede kontakter når en "
+"tilkobling til en konto etableres. ADVARSEL: Dette forårsaker mange "
+"forespørsler!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Dersom True, vil komplettering i samtalerom gjøres slik som shell basert "
+"komplettering."
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"Når skal selv kontakt raden vises. Kan være \"always\",\"when_other_resource"
+"\" eller \"never\""
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4055,12 +4038,14 @@ msgstr "Dersom valgt, gjenopprett siste status brukt."
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
+"Dersom True, vil kontakter som ber om godkjenning bli automatisk akseptert."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
-msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
+msgstr ""
+"Dersom False vil bildeikoner bli slått av og ikke vises i kontaktliste "
+"vinduet."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4101,27 +4086,26 @@ msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Mellomrom sendt etter inaktivitet"
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "XMPP ping sendt etter inaktivitet"
 
 #: ../src/common/config.py:323
-#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
-"Hvor mange sekunder ventes svar på keepalive pakke før vi prøver å koble til "
-"på nytt."
+"Hvor mange sekunder skal man vente på svar fra ping alive pakker før vi "
+"prøver å koble til på nytt."
 
 #. yes, no, ask
 #: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4129,15 +4113,15 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4145,11 +4129,11 @@ msgstr ""
 "Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
 "meldinger skal logges?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4157,101 +4141,101 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' eller ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4260,99 +4244,98 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Feil maskinnavn"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Ugyldig lokal adresse? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
-msgstr "vCard publisering vellykket"
+msgstr "Registrering vellykket"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Registrering med agenten %s var vellykket"
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
-msgstr "vCard publisering feilet"
+msgstr "Registrering feilet"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
+"Registrering med agenten %(agent)s feilet med melding %(error)s: %(error_msg)"
+"s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
+msgstr "En melding fra en ikke-gyldig JID ankom, den har blitt ignorert."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4361,7 +4344,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den (se http://trac.gajim."
 "org/wiki/DatabaseBackup) eller fjern den (all historikk vil bli borte)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
@@ -4369,76 +4352,76 @@ msgstr "Kallenavn ikke lovlig: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Maksimum antall brukere for %s er nådd"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Rommet har blitt ødelagt"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4576,78 +4559,107 @@ msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Det er ikke mulig å sende en melding til %s, JID er ikke gyldig."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Enten er ikke en nøkkel tildelt ellers har ikke kontakten signert."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+"Kontaktens nøkkel (%s) passer ikke sammen med nøkkelen tildelt i Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tittel: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Lagret i: %s"
+msgstr "Servern svarte: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Tilkobling til konto %s har blitt mistet. Prøv igjen."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4656,7 +4668,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4665,24 +4677,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4691,77 +4703,43 @@ msgstr ""
 "Privatlivs listen %s har ikke blitt fjernet. Den er kanskje aktiv i en av "
 "dine tilkoblede ressurser. Deaktiver den og prøv igjen."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Det er ikke mulig å sende tomme filer"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Enten er ikke en nøkkel tildelt ellers har ikke kontakten signert."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-"Kontaktens nøkkel (%s) passer ikke sammen med nøkkelen tildelt i Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Tittel: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Inviter _Kontakter"
+msgstr "Sendt kontakter:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "vCard publisering feilet"
+msgstr "Avregistrering feilet"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+msgstr "Avregistrering med server %(server)s feilet: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
@@ -4777,7 +4755,7 @@ msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus fungerer ikke riktig på denne maskinen"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -4877,17 +4855,17 @@ msgid "quarter past %(0)s"
 msgstr "kvart over %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "ti på halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "fem på halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "half past %(0)s"
 msgstr "halv %(1)s"
 
@@ -5009,7 +4987,7 @@ msgstr "Ledig for Prat"
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Tilgjengelig"
 
@@ -5127,77 +5105,77 @@ msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr "fra rom %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr "fra bruker %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr "fra %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hendelse venter"
 msgstr[1] "%d hendelser venter"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5213,652 +5191,673 @@ msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldig loggnivå"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
 #: ../src/common/passwords.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "for konto %s"
+msgstr "XMPP konto %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Redd"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Forbløffet"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Amorøs"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Sint"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Irritert"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Engstelig"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Opphisset"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Skamfull"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Kjeder seg"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Modig"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Rolig"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Forsiktig"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Kald"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Selvsikker"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Forvirret"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Overveiende"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Utfordrende"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Gretten"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Gal"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Kreativ"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Nysgjerrig"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Nedslått"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Deprimert"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Vemmes"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Forferdet"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Distrahert"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Misunnelig"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Begeistret"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Flørtende"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustrert"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Takknemlig"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Sørgende"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Gretten"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Glad"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Håpefull"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Varm"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Ydmyk"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Ydmyket"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Sulten"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Såret"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Imponert"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "I Respekt"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Forelsket"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Indignert"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Interessert"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Uovervinnelig"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Sjalu"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Ensom"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Bortkommet"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Heldig"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Slem"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Humørsyk"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervøs"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Nøytral"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Opprørt"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Leken"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Stolt"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Avslappet"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Lettet"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Rastløs"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Lei seg"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Tilfreds"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Seriøs"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Sjokkert"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Blyg"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Syk"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Stresset"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Sterk"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Takknemlig"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Tørst"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Trøtt"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Svak"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Bekymret"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Gjør Oppgaver"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Kjøper Grønnsaker"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Vasker"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Koker"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Gjør Vedlikehold"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Tar Oppvasken"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Vasker Skittentøy"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Gjør Hagearbeid"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Løper et Ærend"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Går tur med Hunden"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Drikker"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Tar seg en Øl"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Tar seg en Kaffe"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Tar seg en Kopp Te"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Tar seg en Matbit"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Spiser Frokost"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Spiser Middag"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Spiser Lunch"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Trener"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Sykler"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Danser"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "På tursti"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Jogger"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Spiller Sport"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Løper"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Går på Ski"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Trener"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Steller seg"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "Er på Spa"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Pusser Tenner"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Får seg en Hårklipp"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Barberer seg"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Tar et Bad"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Tar seg en Dusj"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Har en Avtale"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Fridag"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Slapper av"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Gjemmer seg"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "På Ferie"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Ber"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Planlagt Ferie"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Tenker"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Slapper Av"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Fisker"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Spiller"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Går ut"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Fester"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Leser"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Sover"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Røyker"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Sosialiserer"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Soler seg"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Ser på TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Ser på en Film"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Snakker"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "I det Virkelige Liv"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Sitter i Telefonen"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "På Video Telefon"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Reiser"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Pendler"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Kjører"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "I en Bil"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "På en Buss"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "På et Fly"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "På et Tog"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "På en Reise"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Spaserer"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Koder"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "I et Møte"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Studerer"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Skriver"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Ukjent Artist"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Ukjent Tittel"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Ukjent Kilde"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
+"fra  <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5882,36 +5881,11 @@ msgstr ""
 "[Dette er en del av en kryptert sesjon. Dersom du ser denne meldingen gikk "
 "noe galt.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Verten %s du konfigurerte har ft_add_hosts_to_send i avanserte valg og er "
-"ikke gyldig, så den ignoreres."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passordsetning ble ikke gitt"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "For å sende og motta meldinger må du koble til på nytt."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi feil"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5920,53 +5894,44 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke "
-"sendes."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Denne meldingen er kryptert]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5979,24 +5944,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6005,70 +5970,69 @@ msgstr ""
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
-msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
+msgstr "OpenPGP kan ikke brukes på denne maskinen"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6076,145 +6040,143 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
+msgstr "Det er ingen OpenPGP hemmelig nøkkel tilgjengelig."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "For å endre konto navnet må du ikke være tilkoblet."
+msgstr "For å deaktivere kontoen, må du være tilkoblet."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6222,11 +6184,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6234,11 +6196,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6246,11 +6208,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6258,8 +6220,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6269,129 +6230,127 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 "Can være en av følgende:\n"
-"1. bruker@domene/ressurs (bare denne ressursen treffer).\n"
+"1. bruker@domene/ressurs (bare den ressursen treffer).\n"
 "2. bruker@domene (alle ressurser treffer).\n"
-"3. domene/ressurs (bare denne ressursen treffer).\n"
-"4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
-"domene/ressurs, eller adresser i et underdomene."
+"3. domene/ressurs (bare den ressursen treffer).\n"
+"4. domene (domene selv treffer, samt treffer alle bruker@domene,\n"
+"domene/ressurs, eller adresser som inneholder et underdomene)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Kallenavn ikke lovlig: %s"
+msgstr "Tegn ikke lovlig"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Ugyldig innlegg"
+msgstr "Ugyldig rom"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
-"Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, "
+"Du kan gjøre avanserte konto instillinger ved å trykke på Avansert knappen, "
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dette sertifikatet er allerede i filen %s, så det legges ikke til igjen."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6406,7 +6365,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6417,63 +6376,63 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6483,7 +6442,7 @@ msgstr ""
 "har blitt motatt av andre enden. Dersom dette ikonet\n"
 "vises lenge er det sannsynlig at meldingen ble mistet."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6491,227 +6450,223 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt\n"
 "siden sist du fulgte med i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Avslutt"
+msgstr "_Sitat"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "I går"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i dager siden"
+msgid_plural "%i days ago"
+msgstr[0] "I går"
+msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber ID allerede i listen"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber IDen du skrev inn er allerede i lsiten. Vennligst velg en ny. "
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dette navnet er allerede i bruk. Ønsker du å overskrive denne status "
 "meldingen?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Sist men ikke minst ønsker vi å takke alle de som lager installasjonspakker."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6724,98 +6679,101 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings forespørsel for konto %(account)s fra %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Ugyldig konto navn"
+msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
+msgstr ""
+"Du har valgt en konto som du ønsker å bruke for å gå inn i samtalerommet."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan ikke synkronisere med en konto uten å være tilkoblet."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6824,301 +6782,327 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, python-format
 msgid "Form %s"
 msgstr "Skjema %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Lei seg"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Endre"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Fjern"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Jeg vil legge deg til min kontaktliste."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> ønsker at du <b>%s</b> noen kontakter i kontaktlisten. "
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
-msgstr "Adresse"
+msgstr "Legg til"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Humørsyk"
+msgstr "Endre"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Jabber ID:"
+msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Gruppe"
+msgstr "Grupper"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Jeg vil legge deg til min kontaktliste."
+msgstr "%s anbefalte meg å legge til deg i min kontaktliste. "
+
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Legg til kontakt"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Fjerner kontakt fra kontaktlisten"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rekkefølge:  %(order)s, handling: %(action)s, type: %(type)s, verdi: %(value)"
 "s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive et navn for å lage en liste over uønskede."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7129,19 +7113,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7151,19 +7135,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7178,23 +7162,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøkkel (%s) <b>passer ikke</b> med nøkkelen tildelt i Gajim."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7203,7 +7187,7 @@ msgstr ""
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7211,6 +7195,25 @@ msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Andre"
@@ -7220,24 +7223,24 @@ msgstr "Andre"
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7245,241 +7248,232 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
-#: ../src/features_window.py:46
-#, fuzzy
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
-msgstr "SSL sertifikats feil"
+msgstr "SSL sertifikats validering"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Et bibliotek som brukes til å verifisere server sertifikater for å sikre en "
 "sikker tilkobling."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Krever python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverløs samtale med automatisk oppdagede klienter på et lokalt nettverk."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Krever python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Krever pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Kommandoer: %s"
+msgstr "Kommandolinje"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Et script for å kontrollere Gajim via kommandolinjen."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Krever python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Funksjon ikke tilgjengelig i Windows."
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "OpenPGP Kryptering"
+msgstr "OpenPGP meldingskryptering"
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
-msgstr "Kryptering av samtalemeldinger med GPG nøkler."
+msgstr "Krypterer samtalemeldinger med gpg nøkler."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Krever gpg og python-GnuPGInterface."
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
-msgstr "network-manager"
+msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Autodeteksjon av nettverksstatus."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Krever gnome-network-manager og python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Sesjons Behandling"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesjon er lagret på utlogging og gjenopprettes ved pålogging."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Krever python-gnome2."
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Passord for å komme inn i rommet"
+msgstr "Passord kryptering"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passord kan lagres sikkert og ikke bare i klartekst."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Krever gnome-keyring og python-gnome2-desktop."
+msgstr "Krever gnome-keyring og python-gnome2-desktop, eller kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Evne til å koble til servere som bruker SRV records."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Krever dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Krever nslookup for å bruke SRV records."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Stavekontroll"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Stavekontroll av komponerte meldinger."
 
-#: ../src/features_window.py:80
-#, fuzzy
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
-msgstr "Krever python-sexy."
+msgstr "Krever libgtkspell."
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
-msgstr "Kunngjøringer"
+msgstr "Varslinger"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Passiv påminnelse for nye hendelser."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7487,52 +7481,31 @@ msgstr ""
 "Krever python-notify eller alternativt python-dbus i samarbeid med "
 "notification-daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Trayicon"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Et ikon i systemtray som viser gjeldende tilkoblingsstatus."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Krever python-gnome2-extras eller kompilert trayicon modul fra Gajims "
-"kildekode."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Krever PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
-msgstr "_Justér etter status"
+msgstr "Automatisk status"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Evnen til å måle inaktiv tid for å kunne sette auto status."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
-msgstr ""
+msgstr "Krever libxss biblioteket."
 
-#: ../src/features_window.py:93
-#, fuzzy
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
-msgstr "Krever python-gnome2."
+msgstr "Krever python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformer LaTeX uttrykk mellom $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7540,7 +7513,7 @@ msgstr ""
 "Krever texlive-latex-base og dvipng. Du må sette 'use_latex' til True i "
 "Avansert Konfigurasjons Editoren."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7548,25 +7521,23 @@ msgstr ""
 "Krever texlive-latex-base og dvipng (Alt er i MikTeX). Du må sette "
 "'use_latex' til True i Avansert Konfigurasjons Editoren."
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "Ende til Ende Kryptering"
+msgstr "Ende til Ende meldingskryptering"
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Kryptering av samtalemeldinger."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Krever python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7574,24 +7545,37 @@ msgstr ""
 "Generer XHTML ut fra RST kode (see http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Krever python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Faner og klikkbare linker"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Muligheten for å ha klikkbare URLer i samtale og gruppesamtale vindu faner."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Krever python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Krever python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Funksjonalitet"
 
@@ -7607,107 +7591,106 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Fil overføring avbrutt"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottaker:  %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
-msgstr "Fil Overføring Stoppet"
+msgstr "Fil overføring stoppet"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Beskrivelse:"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7715,33 +7698,33 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7749,32 +7732,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pause"
 
@@ -7785,27 +7768,23 @@ msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "importering av PyGTK feilet: %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim trenger PyGTK 2.8 eller høyere"
+msgstr "Gajim trenger PyGTK 2.12 eller høyere"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim tenger PyGTK 2.8 eller høyere for å kjøre. Avslutter..."
+msgstr "Gajim tenger PyGTK 2.12 eller høyere for å kjøre. Avslutter..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim trenger GTK 2.8 eller høyere"
+msgstr "Gajim trenger GTK 2.12 eller høyere"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim trenger GTK 2.8 eller høyere for å kjøre. Avslutter..."
+msgstr "Gajim trenger GTK 2.12 eller høyere for å kjøre. Avslutter..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7843,11 +7822,11 @@ msgstr ""
 "på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7855,465 +7834,28 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Passordsetning Kreves"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Ingen GPG nøkkel tildelt"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Feil Passordsetning"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Ditt ønskede kallenavn i gruppesamtale %s er i bruk eller er registrert av "
-"en annen samtalebruker.\n"
-"Vennligst skriv et annet kallenavn under:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Godtar du denne forespørselen?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Godtar du denne forespørselen på konto %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Tilkobling Feilet"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Feil %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "feil ved sending %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Abonnerings Forespørsel"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Godkjenningsforespørel akseptert"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Du vil alltid se han eller henne som frakoblet.\n"
-"Ønsker du å fjerne han eller henne fra din kontakt liste?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Fjern Abonnement"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt med \"%s\" kan ikke opprettes"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s er nå kjent som %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s er nå %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s har satt tittel til %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Enhver deltaker får log å se din fulle JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Rommet viser nå utilgjengelig medlem"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "rommet viser nå ikke utilgjengelige medlemmer"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "En non-privacy-related rom konfigurasjons ending har skjedd"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Rom logging er nå påslått"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Rom logging er nå avslått"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Rommet er nå ikke-anonymisert"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Rommet er nå semi-anonymisert"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Romet er nå full-anonymisert"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Et passord kreves for å bli med i rommet %s. Vennligst skriv det."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
-"som kjører eller den returnerte feil passord frase.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Passord setningen din er ikke riktig"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Passord setningen din er ikke riktig"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG fungerer ikke"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
-"meldinger."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Ikke spør meg igjen"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring er installert men ikke \t\t\t\t\t\t\tstartet riktig (system "
-"variabel sikkert ikke \t\t\t\t\t\t\tsatt riktig)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Ny e-post på %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Du har %d ny e-post samtale"
-msgstr[1] "Du har %d nye e-post samtaler"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Fra: %(from_address)s\n"
-"Tittel: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s ønsker å sende deg en fil."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Fjerner kontakt fra kontaktlisten"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Feil under lesing av fil:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Du har vellykket sendt %(filename)s til %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Ikke mulig å dekryptere melding fra %s\n"
-"Den kan ha blitt endret."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Klarer ikke å dekryptere meldingen"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Brukernavn Konflikt"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Feil."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Ressurs Konflikt"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
-"et annet"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Feil ved verifisering av SSL sertifikat"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Det skjedde en feil i verifisering av SSL sertifikatet for din jabber "
-"server: %(error)s\n"
-"Ønsker du fortsatt å koble til denne serveren?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignorer denne feilen for dette sertifikatet"
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "SSL sertifikats feil"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Det ser ut som SSL sertifikatet har endret seg ellers blir din tilkobling "
-"hacket.\n"
-"Gammelt fingeravtrykk: %(old)s\n"
-"Nytt fingeravtrykk: %(new)s\n"
-"\n"
-"Ønsker du fortsatt å koble til og oppdatere fingeravtrykket?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Usikker tilkobling"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
-"at du ønsker å gjøre det?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Ja, jeg ønsker å koble til usikkert"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
-"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
-"ønsker å fortsette?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "PEP noden ble ikke fjernet"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Uttryksikoner avslått"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
-"blitt slått av. "
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Ditt konfigurerte følelsesikon tema kunne ikke lastes. Du må kanskje "
-"oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
-"Emoticons for flere detaljer."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Kan ikke lagre dine innstillinger og valg"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Spretter opp et nytt vindu med den neste ventende hendelsen"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8321,51 +7863,51 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "melding"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8373,47 +7915,43 @@ msgstr ""
 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Endrer status på konto eller kontoer"
+msgstr "Endrer prioritet på konto eller kontoer"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Priorit_et:"
+msgstr "prioritet"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Jeg ønsker å _registrere en ny konto"
+msgstr "prioritet du ønsker å gi til kontoen"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
-"til alle kontoer som har \"synkroniser med global status\" valget påslått"
+"endre prioritet til en konto. Dersom uspesifisert, endre status til alle "
+"kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8423,30 +7961,30 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8456,137 +7994,137 @@ msgstr ""
 "nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sender nye meldinger to en gruppesamtale som du er tilkoblet."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på innstillingen, 'verdi' er gjeldende innstilling"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Legger til en ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer innstillinger (globale innstillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8594,72 +8132,71 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI til håndgrep"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Konto som du ønsker å benytte for å håndtere det"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "meldings innhold"
+msgstr "Meldings innhold"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "passord"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8668,15 +8205,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ut som Gajim ikke kjører, så du kan ikke bruke gajim-remote. "
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8685,16 +8222,16 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8703,7 +8240,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8712,7 +8249,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8721,7 +8258,7 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Feil uri"
 
@@ -8750,152 +8287,176 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke lenger i samtalerommet \"%(room)s\" eller \"%(nick)s\" har dratt."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Enhver deltaker får log å se din fulle JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har satt eller endret ditt rom kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s er nå kjent som %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilknytning for %(nick)s har blitt satt til %(affiliation)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilknutning for %(nick)s har blitt satt til %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s er nå %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av samtalerommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Dersom du lukker dette vinduet, så vil du bli koblet fra dette samtalerommet."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Ikke spør meg igjen"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8903,22 +8464,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -8944,57 +8505,471 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Feil under traversering av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Kunne ikke skrive til %s. Sesjons Håndterings støtte vil ikke virke."
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Alltid sjekk om Gajim er standard Jabber klient ved oppstart"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Bilde kan ikke lagres i %(type)s format. Lagre som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ditt ønskede kallenavn i gruppesamtale %s er i bruk eller er registrert av "
+"en annen samtalebruker.\n"
+"Vennligst skriv et annet kallenavn under:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Alltid bruk dette kallenavnet når det er en konflikt"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Godtar du denne forespørselen?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Godtar du denne forespørselen på konto %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Tilkobling Feilet"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Feil %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "feil ved sending %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Abonnerings forespørsel"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Godkjenningsforespørel akseptert"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Du vil alltid se han eller henne som frakoblet.\n"
+"Ønsker du å fjerne han eller henne fra din kontakt liste?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Fjern Abonnement"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt med \"%s\" kan ikke opprettes"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s har satt tittel til %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Rommet viser nå utilgjengelig medlem"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "rommet viser nå ikke utilgjengelige medlemmer"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "En non-privacy-related rom konfigurasjons ending har skjedd"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Rom logging er nå påslått"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Rom logging er nå avslått"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Rommet er nå ikke-anonymisert"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Rommet er nå semi-anonymisert"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Romet er nå full-anonymisert"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Et passord kreves for å bli med i rommet %s. Vennligst skriv det."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
+"som kjører eller den returnerte feil passord frase.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Passord setningen din er ikke riktig"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "OpenGPG Passordord er ikke riktig"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG nøkkel ikke tiltrodd"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"GPG nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
+"virkelig å kryptere denne meldingen?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring er installert men ikke \t\t\t\tstartet riktig (system variabel "
+"sikkert ikke \t\t\t\tsatt riktig)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ny e-post på %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Du har %d ny e-post samtale"
+msgstr[1] "Du har %d nye e-post samtaler"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Fra: %(from_address)s\n"
+"Tittel: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s ønsker å sende deg en fil."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Kontakten stoppet overføring"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Feil under åpning av fil"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Du har vellykket sendt %(filename)s til %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Ikke mulig å dekryptere melding fra %s\n"
+"Den kan ha blitt endret."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Klarer ikke å dekryptere meldingen"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Brukernavn Konflikt"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Feil."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Ressurs Konflikt"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
+"et annet"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s ønsker å sende deg en fil."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Fil Overførings Forespørsel"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Feil ved verifisering av SSL sertifikat"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Det skjedde en feil i verifisering av SSL sertifikatet for din jabber "
+"server: %(error)s\n"
+"Ønsker du fortsatt å koble til denne serveren?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignorer denne feilen for dette sertifikatet"
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "SSL sertifikats feil"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Det ser ut som SSL sertifikatet for konto %(account)s har endret seg eller "
+"din tilkobling blir hacket.\n"
+"Gammelt fingeravtrykk: %(old)s\n"
+"Nytt fingeravtrykk: %(new)s\n"
+"\n"
+"Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Usikker tilkobling"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
+"at du ønsker å gjøre det?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, jeg ønsker å koble til usikkert"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
+"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
+"ønsker å fortsette?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP noden ble ikke fjernet"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Uttryksikoner avslått"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
+"blitt slått av. "
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Ditt konfigurerte følelsesikon tema kunne ikke lastes. Du må kanskje "
+"oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
+"Emoticons for flere detaljer."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Kan ikke lagre dine innstillinger og valg"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Passordsetning Kreves"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "GPG nøkkel utgått"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Din GPG nøkkel er utgått, du vil bli koblet til %s uten OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Feil Passordsetning"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
@@ -9009,7 +8984,7 @@ msgstr "Kontakter"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Dato"
 
@@ -9020,7 +8995,7 @@ msgstr "Kallenavn"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Melding"
 
@@ -9044,192 +9019,188 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Ønsker du virkelig å slette loggene til den valgte kontakten?"
 msgstr[1] "Ønsker du virkelig å slette loggene fra de valgte kontaktene?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Disk Feil"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Feil melding: %s"
+msgstr "Feil: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Feil."
+msgstr "Feil"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Du er ikke tilkoblet til serveren"
+msgstr "Du kommer til å lukke flere tabber"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Ønsker du virkelig å slette den valgte meldingen?"
+msgstr "Ønsker du virkelig å lukke alle?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- meldinger vil bli logget"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- -meldinger vil ikke bli logget"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra gruppesamtalerom %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Melding fra %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:568
 msgid "Ignore"
-msgstr "_Ignorer"
+msgstr "Ignorer"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informasjon motatt"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informasjon IKKE publisert"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9237,48 +9208,53 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9286,28 +9262,27 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Virkelig avslutte Gajim?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
+msgstr "Er du sikker på at du vil avslutte Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Alltid lukk Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9315,16 +9290,16 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått og kontakten er i kontaktlisten."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9332,11 +9307,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9345,69 +9320,71 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
-"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+"Du skal til å blokkere en kontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Denne kontakten vil se deg som frakoblet og du vil ikke motta meldinger han "
+"sender deg."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ønsker du å fjerne gruppen %s fra kontaktlisten?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Også fjerne alle kontakter i denne gruppen fra kontaktlisten"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
+"Du er i ferd med å fjerne \"%(name)s\" (%(jid)s) fra din kontaktliste.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9416,11 +9393,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9428,16 +9405,16 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9447,33 +9424,35 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+"Du skal til å sende en individuell status. Er du sikker på at du ønsker å "
+"fortsette?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Denne kontakten vil midlertidig se deg som %(status)s, men bare til du "
+"endrer status igjen. Da vil han se din nye globale status. "
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du må lage en konto før du kan snakke med andre kontakter."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9481,13 +9460,13 @@ msgstr ""
 "Din server støtter ikke lagring av metakontakt informasjon, så denne "
 "informasjonen vil ikke bli lagret til neste tilkobling."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9497,23 +9476,23 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Ønsker du å sende denne filen til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Send %s"
+msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -9523,157 +9502,156 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Koble ifra"
+msgstr "_Koble til på nytt"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Venter på resultater"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Feil i motatt dataskjema"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Ingen resultater"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Disk SkriveFeil"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9688,7 +9666,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9703,116 +9681,116 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av denne samtalegruppen"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [blokkert]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [minimert]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Siste status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Sang:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9820,29 +9798,28 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
-msgstr "?Client:Ukjent"
+msgstr "?Time:Ukjent"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9850,7 +9827,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9858,13 +9835,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9872,18 +9849,70 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Innkommende melding:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Utgående melding:"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Verten %s du konfigurerte har ft_add_hosts_to_send i avanserte valg og er "
+#~ "ikke gyldig, så den ignoreres."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP passordsetning ble ikke gitt"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr "For å sende og motta meldinger må du koble til på nytt."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke "
+#~ "sendes."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Denne meldingen er kryptert]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i dager siden"
+
+#~ msgid "Trayicon"
+#~ msgstr "Trayicon"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Et ikon i systemtray som viser gjeldende tilkoblingsstatus."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Krever python-gnome2-extras eller kompilert trayicon modul fra Gajims "
+#~ "kildekode."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Krever PyGTK >= 2.10."
+
+#~ msgid "gtk-ok"
+#~ msgstr "Lukk"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Legg til Spesiell _Alarm"
 
@@ -10506,9 +10535,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "A_fter nickname:"
 #~ msgstr "E_tter kallenavn:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "F_ør kallenavn:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Etter tid:"
 
diff --git a/po/nl.po b/po/nl.po
index dc9605ed2..db0bb63a9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -293,9 +293,9 @@ msgstr "Wijzig Persoonlijke Informatie..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -304,9 +304,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Algemeen"
 
@@ -365,21 +365,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informatie over jou, zoals op de server opgeslagen"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Geen"
 
@@ -537,8 +537,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -554,7 +554,7 @@ msgid "Mer_ge accounts"
 msgstr "Accounts _samenvoegen"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Her_noem"
 
@@ -975,7 +975,7 @@ msgstr "Naam:"
 msgid "New entry received"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
@@ -1024,12 +1024,12 @@ msgstr "Geef nieuw wachtwoord op:"
 msgid "<b>Type your new status message</b>"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Actief"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Ruimte:"
@@ -1127,8 +1127,8 @@ msgstr "Wijzig _Groepen"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr ""
 
@@ -1143,8 +1143,8 @@ msgid "Remo_ve"
 msgstr "_Verwijder"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
@@ -1182,8 +1182,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1195,7 +1195,7 @@ msgstr "Verbiedt hem/haar mijn status te zien"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Geschiedenis"
 
@@ -1218,8 +1218,8 @@ msgid "_Subscription"
 msgstr "_Abonnement"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
@@ -1317,7 +1317,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Laat een popup zien als een bestandsoverdracht voltooid is"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Verder"
 
@@ -1325,7 +1325,7 @@ msgstr "_Verder"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Open Bovenliggende Map"
 
@@ -1354,7 +1354,7 @@ msgstr ""
 "Contact\n"
 "Vaandel"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Vetgedrukt"
 
@@ -1375,12 +1375,12 @@ msgstr "Gajim Themas Aanpassen"
 msgid "Gone"
 msgstr "Geen"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 #, fuzzy
 msgid "Inactive"
 msgstr "Actief"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Schuingedrukt"
 
@@ -1428,7 +1428,7 @@ msgstr "Verander _Onderwerp"
 msgid "Configure _Room..."
 msgstr "Configureer _Ruimte"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Maak _Bladwijzer Voor Deze Ruimte"
@@ -1517,8 +1517,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 #, fuzzy
 msgid "Delete"
 msgstr "Wis MOTD"
@@ -1545,7 +1546,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Zoek"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Gespreksgeschiedenis"
 
@@ -1571,7 +1572,7 @@ msgstr "Gespreksgeschiedenis"
 msgid "Bookmark this room"
 msgstr "Maak _Bladwijzer Voor Deze Ruimte"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
@@ -1599,8 +1600,8 @@ msgstr "Recent:"
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Binnengaan"
 
@@ -1631,7 +1632,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Print tijd:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1754,17 +1755,26 @@ msgid "Show a list of formattings"
 msgstr "Klik om een emoticon in te voegen (Alt+E)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Klik om een emoticon in te voegen (Alt+E)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "Ver_stuur"
 
@@ -1908,6 +1918,16 @@ msgid "Configure color and font of the interface"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Status bericht:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Contactnaam"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1916,36 +1936,36 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Statusberichten van contacten weergeven in het rooster"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1953,7 +1973,7 @@ msgid ""
 "display in chat windows."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1961,7 +1981,7 @@ msgid ""
 "send to the other party."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1969,13 +1989,13 @@ msgstr ""
 "Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
 "in beeld"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1984,13 +2004,13 @@ msgstr ""
 "Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
 "tijdens het opstarten"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
@@ -1998,13 +2018,13 @@ msgstr ""
 "Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
 "weergeven"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -2013,7 +2033,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -2022,7 +2042,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam in het roostervenster laten zien."
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2030,7 +2050,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2038,7 +2058,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2046,14 +2066,14 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2064,20 +2084,20 @@ msgstr ""
 "lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
 "contacten niet op je rooster geblokkeerd"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2087,13 +2107,13 @@ msgstr ""
 "(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
 "status online, afwezig, bezig, enz...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -2102,110 +2122,110 @@ msgstr ""
 "Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
 "bijpassende grafische emoticons"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Beheer..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "Account Wijziging"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Speel _geluiden af"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Standaard _status iconenset:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "Style"
 msgstr "Vastgelopen"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 #, fuzzy
 msgid "T_heme:"
 msgstr "Thema:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2213,7 +2233,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2221,118 +2241,118 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Gebruik _transport iconensets"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Fout bij lezen bestand:"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Voor bijnaam:"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "Automatisch _afwezig na:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Beheer Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 #, fuzzy
 msgid "_File manager:"
 msgstr "Bestandsbeheerder:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:110
-#, fuzzy
-msgid "_Incoming message:"
-msgstr "Binnenkomend bericht:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Automatisch _niet beschikbaar na:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Open..."
 msgstr "Open..."
 
-#: ../data/glade/preferences_window.glade.h:115
-#, fuzzy
-msgid "_Outgoing message:"
-msgstr "Uitgaand bericht:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Herstel naar Standaard Kleuren"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 #, fuzzy
 msgid "_Status message:"
 msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "Neem deel aan _Groepsgesprek"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "niet in het rooster"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minuten"
 
@@ -2390,7 +2410,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr ""
 
@@ -2555,7 +2575,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Eigenschappen</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Geluiden</b>"
@@ -2620,8 +2640,8 @@ msgstr "Verwijder account van Gajim en van de server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Verwijder"
 
@@ -2640,14 +2660,15 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
 msgid "gtk-cancel"
 msgstr "Wis MOTD"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-ok"
-msgstr ""
-
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2709,7 +2730,7 @@ msgstr "_Acties"
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "Be_werken"
 
@@ -2755,12 +2776,12 @@ msgid "_Add contact"
 msgstr "_Contact Toevoegen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 #, fuzzy
 msgid "_Information"
 msgstr "Contact Informatie"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Zoek"
 
@@ -2780,10 +2801,6 @@ msgstr "Registreer naar"
 msgid "_Cancel"
 msgstr "_Annulerem"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -3008,338 +3025,325 @@ msgstr "Bron:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Contact Informatie"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Activated"
 msgstr "Actief"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Deactivated"
 msgstr "Actief"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 #, fuzzy
 msgid "Integer"
 msgstr "In de groep"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Voorkeur Naam"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Waarde"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Niets)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr ""
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] ""
+msgstr[1] ""
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "German"
 msgstr "Algemeen"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Greek"
 msgstr "groen"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Croatian"
 msgstr "Locatie"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Italian"
 msgstr "Schuingedrukt"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Polish"
 msgstr "_Publiceren"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Serbian"
 msgstr "Algemeen"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "Onderstreept"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Uit_schoppen"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "Lettertype:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Contact Informatie"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "niet in het rooster"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 "%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "Gebruik aanmelding"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Gebruik aanmelding"
@@ -3347,58 +3351,58 @@ msgstr "Gebruik aanmelding"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Je hebt zojuist een nieuw bericht ontvangen van \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3406,22 +3410,22 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
@@ -3430,23 +3434,23 @@ msgstr "%(nick)s is nu %(status)s"
 msgid "creating logs database"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is een bestand, maar een map werd verwacht"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim sluit nu af"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is een map, maar een bestand werd verwacht"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "map %s wordt aangemaakt"
@@ -3517,10 +3521,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 #, fuzzy
 msgid "Groupchats"
 msgstr "Groupsgesprek"
@@ -3634,9 +3638,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 #, fuzzy
 msgid "default"
 msgstr "Wis MOTD"
@@ -4216,136 +4220,136 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 #, fuzzy
 msgid "I'm available."
 msgstr "Aanwezig"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Open voor Gesprek"
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 #, fuzzy
 msgid "I'm not available."
 msgstr "Niet Beschikbaar"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4354,108 +4358,107 @@ msgstr ""
 "Geluid om af te spelen wanneer een MUC bericht je bijnaam of een van de "
 "woorden in much_highlight_words bevat."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 #, fuzzy
 msgid "Wrong host"
 msgstr "Wachtwoord"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Transport %s heeft niet op tijd geantwoord met registratie informatie"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard publicatie is met succes afgerond"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Bijnaam niet gevonden: %s"
@@ -4463,79 +4466,79 @@ msgstr "Bijnaam niet gevonden: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Die ruimte bestaat niet."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Ruimte creatie is beperkt."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Je geregistreerde bijnaam moet gebruikt worden."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Je staat niet in de ledenlijst"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we zijn nu op %s geabonneert"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "afmelding verzocht van %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we zijn nu van %s afgemeld"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4675,189 +4678,186 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Het is onmogelijk lege bestanden te sturen"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Dit bericht is versleuteld]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Onderwerp: %s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Verbinding"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fout tijdens versturen"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Het is onmogelijk lege bestanden te sturen"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Dit bericht is versleuteld]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Onderwerp: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Inhoud"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transporten"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 #, fuzzy
 msgid "Not in roster"
 msgstr "niet in het rooster"
@@ -5113,7 +5113,7 @@ msgstr "Open voor Gesprek"
 msgid "_Available"
 msgstr "_Aanwezig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Aanwezig"
 
@@ -5235,77 +5235,77 @@ msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tab gesloten"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bericht verzenden"
 msgstr[1] "Bericht verzenden"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5321,16 +5321,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fout: kan %s niet voor lezen openen"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyaan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "logboek database wordt aangemaakt"
@@ -5340,695 +5340,714 @@ msgstr "logboek database wordt aangemaakt"
 msgid "XMPP account %s@%s"
 msgstr "voor account %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "Gepauzeerd"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Vetgedrukt"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Gesprek"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Vetgedrukt"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Inhoud"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Afgerond"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Inhoud"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Actief"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Wis MOTD"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr ""
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Groep"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "bericht"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Onzichtbaar"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "Geen"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Algemeen"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "Be_werk"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Offline"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Groep"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "Wis MOTD"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "Vastgelopen"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "Naam:"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "Uit_schoppen"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "Slapen"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Straat:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Abonneren"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Tijd"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "Onderstreept"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Wachtwoord"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Gebeurtenis"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "Werken"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "In de groep"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Gebeurtenis"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "_Binnengaan"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "Werken"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "Werken"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "Eten"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "Eten"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 #, fuzzy
 msgid "Relaxing"
 msgstr "simpel"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "Eten"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "_Uitloggen"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "Eten"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "Eten"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr ""
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "Slapen"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Eten"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "Eten"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "Verzenden"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "Verbinding"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "Werken"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, fuzzy, python-format
@@ -6048,88 +6067,56 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP wachtwoord niet opgegeven"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Je zult verbonden worden met %s zonder OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Om verdere berichten te versturen en ontvangen, moet je de verbinding "
-"opnieuw in stand brengen."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Dit bericht is versleuteld]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6140,297 +6127,297 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "fout tijdens versturen"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "Statusbericht"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "Inschakelen"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "statusbericht"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 #, fuzzy
 msgid "Rename Account"
 msgstr "Beheer Accounts"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Een Jabber ID moet in de vorm \"gebruiker@servernaam\" zijn."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr ""
 "Er trad een probleem op bij het ophalen van je geheime OpenPGP sleutels."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Zonder verbinding is het niet mogelijk persoonlijke informatie aan te passen."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6440,62 +6427,63 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 #, fuzzy
 msgid "Default"
 msgstr "Wis MOTD"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6503,31 +6491,31 @@ msgstr ""
 "bladwijzer."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 #, fuzzy
 msgid "Invalid server"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6537,34 +6525,34 @@ msgstr ""
 "Je kunt geavanceerde accountopties instellen door op de Geavanceerd knop te "
 "drukken, of later via Accounts in het Bewerken menu van het hoofdvenster."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6574,7 +6562,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6582,77 +6570,77 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6661,237 +6649,234 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "A_fsluiten"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "\"%s\" ontbreekt in de URL van het woordenboek en het is geen WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Gisteren"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i dagen geleden"
+msgid_plural "%i days ago"
+msgstr[0] "Gisteren"
+msgstr[1] "Gisteren"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber IM Client"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contactnaam: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "In de groep"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "SleutelID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Contactnaam"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "Stel MOTD in"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra Adres:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vul de informatie van de contactpersoon in die je aan account %s toe wilt "
 "voegen"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vul de informatie in van de contactpersoon die je toe wilt voegen"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 #, fuzzy
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6900,43 +6885,43 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Ongeldige account naam"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
@@ -6944,67 +6929,70 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr ""
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7014,311 +7002,340 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nieuw Bericht"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Ontvangen %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Van %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Console"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Vastgelopen"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Be_werk"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Verwijder"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 #, fuzzy
 msgid "Add"
 msgstr "Adres"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "Be_werk"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Groep"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Contact Toevoegen"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Verwijdert contact van rooster"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Beschrijving: %s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 #, fuzzy
 msgid "Condition"
 msgstr "Verbinding"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7326,38 +7343,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7367,31 +7384,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Overigen"
@@ -7401,25 +7437,25 @@ msgstr "Overigen"
 msgid "Conference"
 msgstr "Conferentie"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Zonder verbinding is het niet mogelijk te bladeren door aangebode services"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "De service kon niet worden gevonden"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7427,342 +7463,337 @@ msgstr ""
 "Er bestaat geen service op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer nogmaals."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "De service kan niet worden doorbladerd"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Dit soort service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "via account %s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 #, fuzzy
 msgid "_Execute Command"
 msgstr "commando"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Beschrijving"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Bladwijzer bestaat al"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Ruimte \"%s\" heeft al een bladwijzer."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Je kunt bladwijzers beheren via het Acties menu in je rooster."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonneren"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 #, fuzzy
 msgid "Node"
 msgstr "Geen"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Abonneer"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Commando's: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Binnenkomend bericht:"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "_Geschiedenis"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "_Bericht"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Account Wijziging"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Binnenkomend bericht:"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Algemeen"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "Server Mogelijkheden"
@@ -7779,142 +7810,142 @@ msgstr "Tijd"
 msgid "Progress"
 msgstr "Voortgang"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Bestandsnaam: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Grootte: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Jij"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Afzender: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Bestandsoverdracht afgerond"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Bestandsoverdracht geannuleerd"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Kon geen verbinding maken met gebruiker."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Ontvanger: "
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Kies het Bestand om te Sturen"
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Beschrijving: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim heeft geen toegang tot dit bestand"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Dit bestand is in gebruik door een ander proces."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Bestand: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 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:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Wat wil je doen?</b>"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Sla Bestand op als..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7922,32 +7953,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Ongeldig Bestand"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Bestand: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Afzender: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pauze"
 
@@ -8017,449 +8048,40 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Wachtwoord Vereist"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Je zult verbonden worden met %s zonder OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-#, fuzzy
-msgid "Wrong Passphrase"
-msgstr "Wachtwoord"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr ""
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"De gewenste bijnaam is in gebruikt of geregistreerd door een andere "
-"gebruiker.\n"
-"Geef een andere bijnaam op:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Neem je dit verzoek aan?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Neem je dit verzoek aan?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-#, fuzzy
-msgid "Connection Failed"
-msgstr "Verbinding"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Fout bij lezen bestand:"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "fout tijdens versturen"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Abonneringsverzoek"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Machtiging geaccepteerd"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Contact \"%s\" heeft je toestemming gegeven zijn status te zien."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Abonneer"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kan geen contact maken met \"%s\""
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s is nu bekend als %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s is nu %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Je wachtwoord is incorrect"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Je wachtwoord is incorrect"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-#, fuzzy
-msgid "Do _not ask me again"
-msgstr "Vraag mij dit niet nogmaals"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1683
-#, fuzzy, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Je hebt ongelezen berichten"
-msgstr[1] "Je hebt ongelezen berichten"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s wil je een bestand sturen."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Verwijdert contact van rooster"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Fout bij lezen bestand:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Je hebt %(filename)s met succes van %(name)s ontvangen."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Je hebt %(filename)s met succes aan %(name)s gestuurd."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "Bij elk _bericht"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr ""
-
-#: ../src/gajim.py:2043
-#, fuzzy
-msgid "Please type a new username for your local account"
-msgstr "<b>Vul de informatie in voor je nieuwe account</b>"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Bron: "
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Verbinding"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
-"contacten."
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Versleuteling uitgeschakeld"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-#, fuzzy
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Kan je instellingen en voorkeuren niet opslaan"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "laat hulp zien voor een specifiek commando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "commando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "laat hulp zien op commando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Laat een venster opduiken met het volgende ongelezen bericht"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8468,49 +8090,49 @@ msgstr ""
 "Drukt een lijst af van contacten in het rooster. Elke contact komt op een "
 "aparte regel"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "geef alleen contacten weer van de gegeven account"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Drukt een lijst van geregistreerde accounts af"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Verander de status van de account of accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "bericht"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statusbericht"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8519,22 +8141,22 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Verander de status van de account of accounts"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Priori_teit"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Ik wil een nieuwe account _registreren"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8544,27 +8166,27 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Laat het gespreksvenster zien zodat je berichten kunt versturen aan een "
 "contact"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID van de contact waar je me in gesprek wilt gaan"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "Indien opgegeven zal contact van de contactlijst van deze account gehaald "
 "worden"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8575,30 +8197,30 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp sleutel"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "indien opgegeven zal het bericht versleuteld worden met deze publieke sleutel"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "indien opgegeven zal het bericht verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8609,120 +8231,120 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 #, fuzzy
 msgid "subject"
 msgstr "Onderwerp:"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 #, fuzzy
 msgid "message subject"
 msgstr "_Bericht"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 #, fuzzy
 msgid "Name of the account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "bestand"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Bestandspad"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "indien opgegeven zal bestand verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Laat alle voorkeuren zien en hun waarden"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van 'sleutel' op 'waarde'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'key' is de naam van de voorkeur, 'waarde' is de waarde die zal worden "
 "ingesteld"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeur onderdeel"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "sleutel"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Schrijft de huidige staat van de Gajim voorkeuren weg naar het .config "
 "bestand"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Voegt contact toe aan rooster"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Voegt een nieuwe contact toe aan deze account"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -8730,109 +8352,109 @@ msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 #, fuzzy
 msgid "XML to send"
 msgstr "XML Console"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "Nieuwe Ruimte _Binnengaan"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "room"
 msgstr "Van"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Ruimte:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "nick"
 msgstr "Uit_schoppen"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord:"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument \"contact_jid\" ontbreekt"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8841,31 +8463,31 @@ msgstr ""
 "'%s' staat niet op je rooster.\n"
 "Geef een account op om het bericht mee te sturen."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumenten:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8874,7 +8496,7 @@ msgstr ""
 "Gebruik: %s commando [argumenten]\n"
 "Commando is een van:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8883,7 +8505,7 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8892,7 +8514,7 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Wachtwoord"
@@ -8923,177 +8545,202 @@ msgstr "Je kunt je huidige thema niet verwijderen"
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Je bent niet meer in ruimte \"%s\" of \"%s\" heeft de ruimte verlaten."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Verbinding"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s is nu bekend als %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aansluiting: "
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "In de groep"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s is nu %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Weet je zeker dat je de ruimte \"%s\" wilt verlaten?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Als je dit venster sluit zal de verbinding verbroken worden met deze ruimte."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#, fuzzy
+msgid "Do _not ask me again"
+msgstr "Vraag mij dit niet nogmaals"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -9119,61 +8766,455 @@ msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Fout bij verwerken bestand:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Kan niet naar %s schrijven. Sessiebeheer ondersteuning werkt mogelijk niet"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Wil je het overschrijven?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"De gewenste bijnaam is in gebruikt of geregistreerd door een andere "
+"gebruiker.\n"
+"Geef een andere bijnaam op:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Neem je dit verzoek aan?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Neem je dit verzoek aan?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Verbinding"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Fout bij lezen bestand:"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "fout tijdens versturen"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Abonneringsverzoek"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Machtiging geaccepteerd"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Contact \"%s\" heeft je toestemming gegeven zijn status te zien."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Abonneer"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kan geen contact maken met \"%s\""
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Je wachtwoord is incorrect"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Je wachtwoord is incorrect"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1294
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Je hebt ongelezen berichten"
+msgstr[1] "Je hebt ongelezen berichten"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s wil je een bestand sturen."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Verwijdert contact van rooster"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Fout bij lezen bestand:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Je hebt %(filename)s met succes van %(name)s ontvangen."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Je hebt %(filename)s met succes aan %(name)s gestuurd."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Bij elk _bericht"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:1658
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Vul de informatie in voor je nieuwe account</b>"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1721
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Bron: "
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s wil je een bestand sturen."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Bestandsoverdracht Verzoek"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Verbinding"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
+"contacten."
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Versleuteling uitgeschakeld"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Kan je instellingen en voorkeuren niet opslaan"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Wachtwoord Vereist"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Je zult verbonden worden met %s zonder OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+#, fuzzy
+msgid "Wrong Passphrase"
+msgstr "Wachtwoord"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr ""
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Ik zou je graag aan mijn rooster toe willen voegen"
 
@@ -9190,7 +9231,7 @@ msgstr "_Inhoud"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Datum:"
 
@@ -9202,7 +9243,7 @@ msgstr "Bijnaam:"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "_Bericht"
 
@@ -9221,200 +9262,200 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] ""
 msgstr[1] ""
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Gespreksgeschiedenis van %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr ""
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Afbeelding is te groot"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 #, fuzzy
 msgid "Group Chats"
 msgstr "Groupsgesprek"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Gesprek"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nieuw Enkel Bericht"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nieuw Enkel Bericht"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "_Verder"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 #, fuzzy
 msgid "File is empty"
 msgstr "Bestandspad"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 #, fuzzy
 msgid "File does not exist"
 msgstr "Die ruimte bestaat niet."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 #, fuzzy
 msgid "Information received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Het is niet mogelijk je contact informatie te publiceren zonder verbinding."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9422,46 +9463,51 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later nogmaals."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Als \"%s\" dit verzoek aanneemt zal je zijn status kunnen ontvangen."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Je zult verbonden worden met %s zonder OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9470,28 +9516,28 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Weet je zeker dat je de ruimten \"%s\" wilt verlaten?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9500,16 +9546,16 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9518,12 +9564,12 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9532,74 +9578,74 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Inhoud"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Verwijder"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9609,12 +9655,12 @@ msgstr ""
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9622,17 +9668,17 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Ik wil dat deze contact mijn status blijf zien na verwijdering"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9641,7 +9687,7 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -9649,34 +9695,34 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -9684,31 +9730,31 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ongeldig Bestand"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s wil je een bestand sturen:"
 msgstr[1] "%s wil je een bestand sturen:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Stuur %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Stuurt een bestand aan contact"
@@ -9718,169 +9764,169 @@ msgstr "Stuurt een bestand aan contact"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Beheer Bladwijzers..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publiceren"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Ontdek Services..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Ver_stuur Server Bericht"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 #, fuzzy
 msgid "To all online users"
 msgstr "_Online Gebruikers"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Inhoud"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transporten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transporten"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contact is Ingelogd"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contact is Ingelogd"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 #, fuzzy
 msgid "History Manager"
 msgstr "_Geschiedenis"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9890,7 +9936,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9900,120 +9946,120 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Bron: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "Verbinding"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contact is Ingelogd"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Type:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Afgerond"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze service heeft nog niet geantwoord met gedetaileerde informatie"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10021,30 +10067,30 @@ msgstr ""
 "Deze service kon niet antwoorde met gedetaileerde informatie.\n"
 "Het is waarschijnlijk veroudert of kapot"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10052,7 +10098,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10060,32 +10106,55 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Jij en de contact zijn beide geïnteresseert in elkaars aanwezigheid"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Jij en de contact zijn beide niet geïnteresseert in elkaars aanwezigheid"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Je bent aan het wachten op bevestiging van jou op abonnement op deze contact"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
 #, fuzzy
+#~ msgid "_Incoming message:"
+#~ msgstr "Binnenkomend bericht:"
+
+#, fuzzy
+#~ msgid "_Outgoing message:"
+#~ msgstr "Uitgaand bericht:"
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP wachtwoord niet opgegeven"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Om verdere berichten te versturen en ontvangen, moet je de verbinding "
+#~ "opnieuw in stand brengen."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Dit bericht is versleuteld]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i dagen geleden"
+
+#, fuzzy
 #~ msgid "Add Special _Notification"
 #~ msgstr "<b>Visuele Meldingen</b>"
 
@@ -10348,10 +10417,6 @@ msgstr " bron met prioriteit"
 #~ msgid "Also known as iChat style"
 #~ msgstr "Ook bekend als iChat-stijl"
 
-#, fuzzy
-#~ msgid "B_efore nickname:"
-#~ msgstr "Voor bijnaam:"
-
 #~ msgid "Chat"
 #~ msgstr "Gesprek"
 
diff --git a/po/no.po b/po/no.po
index 7847b7a71..b0ae93387 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,10 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-19 23:58+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
-"Language-Team:  <>\n"
+"Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -92,7 +92,7 @@ msgstr "<b>Vennligst velg en server</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -103,9 +103,8 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Bruk autentisering"
+msgstr "Anon_ym autentisering"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -279,9 +278,9 @@ msgstr "Rediger Personlig Informasjon..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -290,9 +289,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Generelle"
 
@@ -351,21 +350,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Ingen"
 
@@ -471,18 +470,16 @@ msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
-msgstr "_Justér etter status"
+msgstr "J_ustér etter status"
 
 #: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Kontoer"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Bruk autentisering"
+msgstr "Anonym autentisering"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -493,9 +490,8 @@ msgstr ""
 "usikker tilkobling"
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
-msgstr "K_oble til når Gajim starter"
+msgstr "Ko_ble til når Gajim starter"
 
 #: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
@@ -522,8 +518,8 @@ msgstr ""
 "Du kan også vurdere å endre mulige brannmur innstillinger."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -537,57 +533,47 @@ msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
-msgstr "Send hold-i-live meldinger"
+msgstr "Send _hold-i-live pakker"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
-msgstr "Synk_roniser konto status med global status"
+msgstr "Synkroni_ser konto status med global status"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use G_PG Agent"
-msgstr "Bruk GPG _Agent"
+msgstr "Bruk G_PG Agent"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
-msgstr "Bruk egendefinert maskinnavn/port"
+msgstr "Bruk egen_definert maskinnavn/port"
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Bruk egendefinert port:"
+msgstr "Bruk egen_definert port:"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "Rediger Personlig Informasjon..."
+msgstr "_Rediger Personlig Informasjon..."
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Slå på"
+msgstr "_Slå på"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
 msgstr "_Maskinnavn:"
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Behandle..."
+msgstr "_Behandle..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
 msgstr "_Port:"
 
@@ -596,13 +582,12 @@ msgid "_Warn before using an insecure connection"
 msgstr "_Advar før benyttelse av en usikker tilkobling"
 
 #: ../data/glade/accounts_window.glade.h:63
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
-msgstr "bruk HTTP_PROXY system variabel"
+msgstr "_bruk HTTP_PROXY system variabel"
 
 #: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
-msgstr "gtk-tilføy"
+msgstr "legg til"
 
 #: ../data/glade/accounts_window.glade.h:65
 #: ../data/glade/features_window.glade.h:4
@@ -945,7 +930,7 @@ msgstr "Sist endret:"
 msgid "New entry received"
 msgstr "Ny hendelse motatt"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Du har mottatt en ny inntreden:"
 
@@ -989,11 +974,11 @@ msgstr "Skriv inn nytt passord:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Skriv inn din nye status melding:</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Aktivitet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Humør:"
 
@@ -1073,9 +1058,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Tilegn Open_PGP Nøkkel..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Kjør Kommando..."
+msgstr "K_jør Kommando..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1083,8 +1067,8 @@ msgstr "Rediger _Grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -1097,8 +1081,8 @@ msgid "Remo_ve"
 msgstr "_Fjern"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
@@ -1131,8 +1115,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Blokker"
 
@@ -1143,7 +1127,7 @@ msgstr "_Forby han/henne å se min status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Historie"
 
@@ -1164,8 +1148,8 @@ msgid "_Subscription"
 msgstr "_Abonnement"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Frigi"
 
@@ -1253,7 +1237,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -1261,7 +1245,7 @@ msgstr "_Fortsett"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
 
@@ -1289,7 +1273,7 @@ msgstr ""
 "Kontakt rad\n"
 "Samtale Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Fet"
 
@@ -1309,11 +1293,11 @@ msgstr "Gajim Tema Valg"
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1361,7 +1345,7 @@ msgstr "Endre _Tittel..."
 msgid "Configure _Room..."
 msgstr "Konfigurer _Rom..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Bokmerke"
 
@@ -1449,8 +1433,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Historikk og Logg Behandler</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Slett"
 
@@ -1480,7 +1465,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Søk Databasen"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
@@ -1504,11 +1489,10 @@ msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "_Bokmerke dette rommet (Ctrl+B)"
+msgstr "Bokmerke dette rommet"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
@@ -1535,8 +1519,8 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1564,7 +1548,7 @@ msgstr "Minimer ved Automatisk Deltakelse"
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1582,7 +1566,7 @@ msgstr "_Konfigurer"
 
 #: ../data/glade/manage_pep_services_window.glade.h:3
 msgid "gtk-delete"
-msgstr "gtk-delete"
+msgstr "delete"
 
 #: ../data/glade/manage_proxies_window.glade.h:1
 msgid "<b>Properties</b>"
@@ -1593,14 +1577,14 @@ msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
 msgstr ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1611,34 +1595,28 @@ msgid "Pass_word:"
 msgstr "Pass_ord:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgstr "Proxy _Host:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-#, fuzzy
 msgid "Use HTTP prox_y"
-msgstr "_Bruk proxy"
+msgstr "Bruk HTTP prox_y"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Bruk autentisering"
+msgstr "Bruk proxy aut_entisering"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
-#, fuzzy
 msgid "_BOSH URL:"
-msgstr "_URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Skriv:"
+msgstr "_Skriv:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
@@ -1677,22 +1655,30 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Vis en liste over uttrykksikon (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
-#, fuzzy
 msgid "Show a list of formattings"
-msgstr "Vis en liste over uttrykksikon (Alt+M)"
+msgstr "Vis en liste over formatteringer"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Vis kontaktens profil (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Send"
 
@@ -1790,7 +1776,7 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:26
 msgid "Allow sound when I'm _busy"
-msgstr ""
+msgstr "Tillat lys når jeg er _opptatt"
 
 #: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
@@ -1823,6 +1809,16 @@ msgid "Configure color and font of the interface"
 msgstr "Konfigurer farge og font for grensesnittet"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Samtale melding:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Kontakt navn"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1836,31 +1832,31 @@ msgstr ""
 "Frakoblet kontaktliste med samtaler gruppert etter konto\n"
 "Frakoblet kontaktliste med samtaler gruppert etter type"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Vis _aktivitet til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis _sanger til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1870,7 +1866,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1880,7 +1876,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1888,11 +1884,11 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Gjem alle knapper i samtale vinduer"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1900,20 +1896,20 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Dersom valgt vil Gajim endre status til Borte når maskinen ikke brukes."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1921,7 +1917,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1929,7 +1925,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1937,25 +1933,25 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise aktivitet for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise sanger som kontakter spiller i kontaktliste "
 "vinduet"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1965,7 +1961,7 @@ msgstr ""
 "Dersom ikke noe språk er valgt med høyreklikking i feltet vil standard "
 "språkvalg brukes for denne kontakten eller gruppesamtale."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1975,7 +1971,7 @@ msgstr ""
 "kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
 "kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1985,14 +1981,14 @@ msgstr ""
 "husk at når man bruker E2E kryptering må den andre parten være enig i at "
 "logging er OK, ellers vil ikke beskjeder logges."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 "Dersom valgt vil Gajim vise en melding når en ny e-post mottas fra GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2001,7 +1997,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2009,7 +2005,7 @@ msgstr ""
 "Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
 "beskjed vil benyttes isteden."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2017,50 +2013,53 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Logg _krypterte samtale sesjoner"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Gj_ør meldings vinduet kompakt"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Aldri\n"
+"Bare når hendelser venter\n"
+"Alltid"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Kunngjøringer"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Alarmér om nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Personlige Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2070,24 +2069,23 @@ msgstr ""
 "Varsle meg om det\n"
 "Vis bare i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
-msgstr "_Vis hendelse i systemstatusfeltet"
+msgstr "Vis systemstatus:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2095,28 +2093,27 @@ msgstr ""
 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
 "valgt vil Gajim kun vise rå meldings tekst."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Standard _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2124,10 +2121,11 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 "Automatisk borte status melding. Dersom tom vil Gajim ikke endre gjeldende "
-"status melding"
+"status melding\n"
+"$S byttes ut av tidligere status melding\n"
+"$T byttest ut av automatisk-borte tidsavbrudd"
 
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2135,105 +2133,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Automatisk ikke tilgjengelig meldingen. Dersom tom vil Gajim ikke endre "
-"gjeldende status melding"
+"gjeldende status melding\n"
+"$S vil byttes ut av forrige status melding\n"
+"$T vil byttes ut av automatisk-ikke-tilgjengelig tidsavbrudd"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Bruk _transport ikoner"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Bruk systemets _standardinstillinger"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Når en ny hendelse blir motatt:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Feil melding: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "F_ør kallenavn:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "_Borte etter:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "_Vis samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Innkommende melding:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "_Ikke tilgjengelig etter:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Utgående melding:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "_Send Samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "_URL utheving:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "i _gruppe samtale"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutter"
 
@@ -2266,9 +2268,8 @@ msgid "All"
 msgstr "Alle"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "alle etter abonnement"
+msgstr "Alle (inkludert abonnement)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2286,7 +2287,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -2430,7 +2431,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
@@ -2490,8 +2491,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Fjern"
 
@@ -2500,24 +2501,25 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>noen@etsted.no</b> ønsker at du skal <b>legge til</b> noen kontakter i "
+"kontaktlisten din."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Meldings Kropp <brukes ikke, derfor gjemt som standard>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Kontaktliste Element Utveksling"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-lukk"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-lukk"
+msgid "gtk-cancel"
+msgstr "Avbryt"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2544,9 +2546,8 @@ msgid "Profile, A_vatar"
 msgstr "Profil, B_ilde"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Vis _Frakoblede Kontakter"
+msgstr "Vis Bare _Aktive Kontakter"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2575,7 +2576,7 @@ msgstr "_Handlinger"
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Rediger"
 
@@ -2597,7 +2598,7 @@ msgstr "_Avslutt"
 
 #: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
-msgstr "_Send Enkelt Melding..."
+msgstr "_Send Enkeltmelding..."
 
 #: ../data/glade/roster_window.glade.h:26
 msgid "_View"
@@ -2616,11 +2617,11 @@ msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Søk"
 
@@ -2640,10 +2641,6 @@ msgstr "Registrer til:"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2750,9 +2747,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>Stat:</b>"
+msgstr "<b>Kontakt tid:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
@@ -2851,285 +2847,265 @@ msgstr "Ressurs:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Du er i ferd med å eksekvere en kommando. Ønsker du å avbryte den?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Tjenesten sendte ødelagte data"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Tjenesten endret sesjons identifikasjon. "
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktivert"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Deaktivert"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Nummer"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Farge"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Gjemt"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Du har mottatt en ny inntreden:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Du har motatt nye hendelser (og %(count)d vises ikke):"
+msgstr[1] "Du har motatt nye hendelser (og %(count)d vises ikke):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretagner"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Brtisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:820
-#, fuzzy
+#: ../src/chat_control.py:861
 msgid "Underline"
-msgstr "Udefinert"
+msgstr "Understrek"
 
-#: ../src/chat_control.py:821
-#, fuzzy
+#: ../src/chat_control.py:862
 msgid "Strike"
-msgstr "Syk"
+msgstr "Streik"
 
-#: ../src/chat_control.py:844
-#, fuzzy
+#: ../src/chat_control.py:885
 msgid "Font"
-msgstr "_Font:"
+msgstr "Font"
 
-#: ../src/chat_control.py:853
-#, fuzzy
+#: ../src/chat_control.py:894
 msgid "Clear formating"
-msgstr "Kontaktinformasjon"
+msgstr "Fjern formattering"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Dersom du sender en fil til %s, vil han/henne kjenne din ekte Jabber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
-msgstr "ikke i kontaktliste"
+msgstr "Ikke i kontaktliste"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "En liste over aktive, komplette og stoppede fil overføringer"
+msgstr "Denne kontakten støtter ikke filoverføring."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr ""
-
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Ukjent Artist"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Ukjent Tittel"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Ukjent Kilde"
+msgstr "Du må vite det ekte "
 
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
-"fra  <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3137,50 +3113,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
 msgstr "og IKKE autentisert"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3189,23 +3165,23 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3213,25 +3189,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Den følgende meldingen ble kryptert"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3239,15 +3215,15 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3256,7 +3232,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
@@ -3265,23 +3241,23 @@ msgstr "%(name)s er nå %(status)s"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er en fil men skulle ha vært en katalog"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er en katalog men skulle vært en fil"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
@@ -3344,10 +3320,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
@@ -3365,7 +3341,7 @@ msgstr "Alle uleste meldinger har blitt videresendt."
 
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Lag lyd når bruker er opptatt"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3373,7 +3349,7 @@ msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+msgstr "Vis bare tilkoblede og ledig for samtale kontakter i kontaktlisten. "
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3404,51 +3380,47 @@ msgstr "$S vil bli byttet ut med gjeldende status melding, $T av auoxa tid."
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
+"Når skal systemikon vises. Kan være 'aldri', 'ved_hendelse', 'alltid'. "
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Ugyldig kallenavn"
+msgstr "Innkommende kallenavns farge."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Utgående kallenavn farge."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Innkommende tekst farge."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Utgående tekst farge."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "status melding tekst"
+msgstr "Status meldings tekst farge."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Ugyldig kallenavn"
+msgstr "Innkommende kallenavns font."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Endrer Kallenavn"
+msgstr "Utgående kallenavns font."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Innkommende tekst font."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Utgående tekst font."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "status melding tekst"
+msgstr "Status meldings tekst font."
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3457,9 +3429,9 @@ msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "standard"
 
@@ -3546,7 +3518,7 @@ msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
 #: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
-msgstr "Legg * og [n] inn i kontaktliste tittelen?"
+msgstr "Legg til * og [n] inn i kontaktliste tittelen?"
 
 #: ../src/common/config.py:166
 msgid ""
@@ -3564,16 +3536,22 @@ msgstr ""
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
 msgstr ""
+"Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr ""
+"Hvor mange minutter med logg skal man be om når man går inn i en "
+"gruppesamtale. "
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Hvor mange sekunder skal man venter før man prøver en automatisk re-"
+"tilkobling til en samtale som du har blitt frakoblet. Sett til 0 for "
+"deaktiver automatisk re-tilkobling"
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3658,6 +3636,8 @@ 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 ""
+"Spør før lukking av fanet samtalevindu dersom det er kontrol som kan miste "
+"data (samtale, privat samtale, gruppesamtaler vil ikke bli minimert)"
 
 #: ../src/common/config.py:192
 msgid ""
@@ -3898,22 +3878,20 @@ msgstr ""
 "innhold mener at vi aldri viser dialogen."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
-"innhold mener at vi aldri viser dialogen."
+"Skal vi vise bekrefte blokk kontakt dialog eller ikke? Tomt tekststreng "
+"betyr at vi aldri viser dialogen."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
-"innhold mener at vi aldri viser dialogen."
+"Skal vi vise bekrefte egendefinert status dialog eller ikke? Tomt "
+"tekststreng betyr at vi aldri viser dialogen."
 
 #: ../src/common/config.py:259
 msgid ""
@@ -3934,13 +3912,12 @@ msgstr ""
 "konto passord."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
-"konto passord."
+"Dersom True vil Gajim bruke KDE Wallet (dersom kwalletcli er tilgjengelig) "
+"til å lagre konto passord."
 
 #: ../src/common/config.py:262
 msgid ""
@@ -3963,7 +3940,7 @@ msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
-"Dersom Sant vil Gajim skrolle og velge kontakten som sendte deg siste "
+"Dersom True vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
 #: ../src/common/config.py:265
@@ -3971,7 +3948,7 @@ msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
-"Dersom Sant vil Gajim konvertere mellom $$ og $$ til et bilde med dvips og "
+"Dersom True vil Gajim konvertere mellom $$ og $$ til et bilde med dvips og "
 "konvertere før innsetting i et samtale vindu."
 
 #: ../src/common/config.py:266
@@ -3990,7 +3967,7 @@ msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
-"Dersom Sant vil kunngjøringsvinduer fra notification-deamon bli festet til "
+"Dersom True vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
 #: ../src/common/config.py:269
@@ -4006,29 +3983,35 @@ msgstr ""
 "er større."
 
 #: ../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)"
 msgstr ""
 "Lovlige uri skjema. Bare skjema i denne listen vil bli aksepterte som en "
-"\"ekte\" uri."
+"\"ekte\" uri. (mailto og xmpp håndteres separat)"
 
 #: ../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 ""
+"Spør om frakoblet status melding til alle frakoblede kontakter når en "
+"tilkobling til en konto etableres. ADVARSEL: Dette forårsaker mange "
+"forespørsler!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Dersom True, vil komplettering i samtalerom gjøres slik som shell basert "
+"komplettering."
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"Når skal selv kontakt raden vises. Kan være \"always\",\"when_other_resource"
+"\" eller \"never\""
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4055,12 +4038,14 @@ msgstr "Dersom valgt, gjenopprett siste status brukt."
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
+"Dersom True, vil kontakter som ber om godkjenning bli automatisk akseptert."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
-msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
+msgstr ""
+"Dersom False vil bildeikoner bli slått av og ikke vises i kontaktliste "
+"vinduet."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4101,27 +4086,26 @@ msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Mellomrom sendt etter inaktivitet"
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "XMPP ping sendt etter inaktivitet"
 
 #: ../src/common/config.py:323
-#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
-"Hvor mange sekunder ventes svar på keepalive pakke før vi prøver å koble til "
-"på nytt."
+"Hvor mange sekunder skal man vente på svar fra ping alive pakker før vi "
+"prøver å koble til på nytt."
 
 #. yes, no, ask
 #: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4129,15 +4113,15 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4145,11 +4129,11 @@ msgstr ""
 "Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
 "meldinger skal logges?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4157,101 +4141,101 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' eller ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4260,99 +4244,98 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Feil maskinnavn"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Ugyldig lokal adresse? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
-msgstr "vCard publisering vellykket"
+msgstr "Registrering vellykket"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Registrering med agenten %s var vellykket"
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
-msgstr "vCard publisering feilet"
+msgstr "Registrering feilet"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
+"Registrering med agenten %(agent)s feilet med melding %(error)s: %(error_msg)"
+"s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
+msgstr "En melding fra en ikke-gyldig JID ankom, den har blitt ignorert."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4361,7 +4344,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den (se http://trac.gajim."
 "org/wiki/DatabaseBackup) eller fjern den (all historikk vil bli borte)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
@@ -4369,76 +4352,76 @@ msgstr "Kallenavn ikke lovlig: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Maksimum antall brukere for %s er nådd"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Rommet har blitt ødelagt"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4576,78 +4559,107 @@ msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Det er ikke mulig å sende en melding til %s, JID er ikke gyldig."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Enten er ikke en nøkkel tildelt ellers har ikke kontakten signert."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+"Kontaktens nøkkel (%s) passer ikke sammen med nøkkelen tildelt i Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tittel: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Lagret i: %s"
+msgstr "Servern svarte: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Tilkobling til konto %s har blitt mistet. Prøv igjen."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4656,7 +4668,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4665,24 +4677,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4691,77 +4703,43 @@ msgstr ""
 "Privatlivs listen %s har ikke blitt fjernet. Den er kanskje aktiv i en av "
 "dine tilkoblede ressurser. Deaktiver den og prøv igjen."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Det er ikke mulig å sende tomme filer"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Enten er ikke en nøkkel tildelt ellers har ikke kontakten signert."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-"Kontaktens nøkkel (%s) passer ikke sammen med nøkkelen tildelt i Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Tittel: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Inviter _Kontakter"
+msgstr "Sendt kontakter:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "vCard publisering feilet"
+msgstr "Avregistrering feilet"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+msgstr "Avregistrering med server %(server)s feilet: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
@@ -4777,7 +4755,7 @@ msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus fungerer ikke riktig på denne maskinen"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -4877,17 +4855,17 @@ msgid "quarter past %(0)s"
 msgstr "kvart over %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "ti på halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "fem på halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "half past %(0)s"
 msgstr "halv %(1)s"
 
@@ -5009,7 +4987,7 @@ msgstr "Ledig for Prat"
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Tilgjengelig"
 
@@ -5127,77 +5105,77 @@ msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr "fra rom %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr "fra bruker %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr "fra %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hendelse venter"
 msgstr[1] "%d hendelser venter"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5213,652 +5191,673 @@ msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldig loggnivå"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
 #: ../src/common/passwords.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "for konto %s"
+msgstr "XMPP konto %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Redd"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Forbløffet"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Amorøs"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Sint"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Irritert"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Engstelig"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Opphisset"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Skamfull"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Kjeder seg"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Modig"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Rolig"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Forsiktig"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Kald"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Selvsikker"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Forvirret"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Overveiende"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Utfordrende"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Gretten"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Gal"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Kreativ"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Nysgjerrig"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Nedslått"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Deprimert"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Vemmes"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Forferdet"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Distrahert"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Misunnelig"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Begeistret"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Flørtende"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustrert"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Takknemlig"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Sørgende"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Gretten"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Glad"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Håpefull"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Varm"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Ydmyk"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Ydmyket"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Sulten"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Såret"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Imponert"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "I Respekt"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Forelsket"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Indignert"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Interessert"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Uovervinnelig"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Sjalu"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Ensom"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Bortkommet"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Heldig"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Slem"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Humørsyk"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervøs"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Nøytral"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Opprørt"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Leken"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Stolt"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Avslappet"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Lettet"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Rastløs"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Lei seg"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Tilfreds"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Seriøs"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Sjokkert"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Blyg"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Syk"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Stresset"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Sterk"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Takknemlig"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Tørst"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Trøtt"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Svak"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Bekymret"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Gjør Oppgaver"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Kjøper Grønnsaker"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Vasker"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Koker"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Gjør Vedlikehold"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Tar Oppvasken"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Vasker Skittentøy"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Gjør Hagearbeid"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Løper et Ærend"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Går tur med Hunden"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Drikker"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Tar seg en Øl"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Tar seg en Kaffe"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Tar seg en Kopp Te"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Tar seg en Matbit"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Spiser Frokost"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Spiser Middag"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Spiser Lunch"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Trener"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Sykler"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Danser"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "På tursti"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Jogger"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Spiller Sport"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Løper"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Går på Ski"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Trener"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Steller seg"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "Er på Spa"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Pusser Tenner"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Får seg en Hårklipp"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Barberer seg"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Tar et Bad"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Tar seg en Dusj"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Har en Avtale"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Fridag"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Slapper av"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Gjemmer seg"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "På Ferie"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Ber"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Planlagt Ferie"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Tenker"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Slapper Av"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Fisker"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Spiller"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Går ut"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Fester"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Leser"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Sover"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Røyker"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Sosialiserer"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Soler seg"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Ser på TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Ser på en Film"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Snakker"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "I det Virkelige Liv"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Sitter i Telefonen"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "På Video Telefon"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Reiser"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Pendler"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Kjører"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "I en Bil"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "På en Buss"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "På et Fly"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "På et Tog"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "På en Reise"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Spaserer"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Koder"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "I et Møte"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Studerer"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Skriver"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Ukjent Artist"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Ukjent Tittel"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Ukjent Kilde"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
+"fra  <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5882,36 +5881,11 @@ msgstr ""
 "[Dette er en del av en kryptert sesjon. Dersom du ser denne meldingen gikk "
 "noe galt.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Verten %s du konfigurerte har ft_add_hosts_to_send i avanserte valg og er "
-"ikke gyldig, så den ignoreres."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passordsetning ble ikke gitt"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "For å sende og motta meldinger må du koble til på nytt."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi feil"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5920,53 +5894,44 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke "
-"sendes."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Denne meldingen er kryptert]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5979,24 +5944,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6005,70 +5970,69 @@ msgstr ""
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
-msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
+msgstr "OpenPGP kan ikke brukes på denne maskinen"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6076,145 +6040,143 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
+msgstr "Det er ingen OpenPGP hemmelig nøkkel tilgjengelig."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "For å endre konto navnet må du ikke være tilkoblet."
+msgstr "For å deaktivere kontoen, må du være tilkoblet."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6222,11 +6184,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6234,11 +6196,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6246,11 +6208,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6258,8 +6220,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6269,129 +6230,127 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 "Can være en av følgende:\n"
-"1. bruker@domene/ressurs (bare denne ressursen treffer).\n"
+"1. bruker@domene/ressurs (bare den ressursen treffer).\n"
 "2. bruker@domene (alle ressurser treffer).\n"
-"3. domene/ressurs (bare denne ressursen treffer).\n"
-"4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
-"domene/ressurs, eller adresser i et underdomene."
+"3. domene/ressurs (bare den ressursen treffer).\n"
+"4. domene (domene selv treffer, samt treffer alle bruker@domene,\n"
+"domene/ressurs, eller adresser som inneholder et underdomene)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Kallenavn ikke lovlig: %s"
+msgstr "Tegn ikke lovlig"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Ugyldig innlegg"
+msgstr "Ugyldig rom"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
-"Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, "
+"Du kan gjøre avanserte konto instillinger ved å trykke på Avansert knappen, "
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dette sertifikatet er allerede i filen %s, så det legges ikke til igjen."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6406,7 +6365,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6417,63 +6376,63 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6483,7 +6442,7 @@ msgstr ""
 "har blitt motatt av andre enden. Dersom dette ikonet\n"
 "vises lenge er det sannsynlig at meldingen ble mistet."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6491,227 +6450,223 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt\n"
 "siden sist du fulgte med i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Avslutt"
+msgstr "_Sitat"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "I går"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i dager siden"
+msgid_plural "%i days ago"
+msgstr[0] "I går"
+msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber ID allerede i listen"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber IDen du skrev inn er allerede i lsiten. Vennligst velg en ny. "
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dette navnet er allerede i bruk. Ønsker du å overskrive denne status "
 "meldingen?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Sist men ikke minst ønsker vi å takke alle de som lager installasjonspakker."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6724,98 +6679,101 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings forespørsel for konto %(account)s fra %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Ugyldig konto navn"
+msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
+msgstr ""
+"Du har valgt en konto som du ønsker å bruke for å gå inn i samtalerommet."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan ikke synkronisere med en konto uten å være tilkoblet."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6824,301 +6782,327 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, python-format
 msgid "Form %s"
 msgstr "Skjema %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Lei seg"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Endre"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Fjern"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Jeg vil legge deg til min kontaktliste."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> ønsker at du <b>%s</b> noen kontakter i kontaktlisten. "
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
-msgstr "Adresse"
+msgstr "Legg til"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Humørsyk"
+msgstr "Endre"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Jabber ID:"
+msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Gruppe"
+msgstr "Grupper"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Jeg vil legge deg til min kontaktliste."
+msgstr "%s anbefalte meg å legge til deg i min kontaktliste. "
+
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Legg til kontakt"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Fjerner kontakt fra kontaktlisten"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rekkefølge:  %(order)s, handling: %(action)s, type: %(type)s, verdi: %(value)"
 "s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive et navn for å lage en liste over uønskede."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7129,19 +7113,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7151,19 +7135,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7178,23 +7162,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøkkel (%s) <b>passer ikke</b> med nøkkelen tildelt i Gajim."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7203,7 +7187,7 @@ msgstr ""
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7211,6 +7195,25 @@ msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Andre"
@@ -7220,24 +7223,24 @@ msgstr "Andre"
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7245,241 +7248,232 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
-#: ../src/features_window.py:46
-#, fuzzy
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
-msgstr "SSL sertifikats feil"
+msgstr "SSL sertifikats validering"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Et bibliotek som brukes til å verifisere server sertifikater for å sikre en "
 "sikker tilkobling."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Krever python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverløs samtale med automatisk oppdagede klienter på et lokalt nettverk."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Krever python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Krever pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Kommandoer: %s"
+msgstr "Kommandolinje"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Et script for å kontrollere Gajim via kommandolinjen."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Krever python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Funksjon ikke tilgjengelig i Windows."
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "OpenPGP Kryptering"
+msgstr "OpenPGP meldingskryptering"
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
-msgstr "Kryptering av samtalemeldinger med GPG nøkler."
+msgstr "Krypterer samtalemeldinger med gpg nøkler."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Krever gpg og python-GnuPGInterface."
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
-msgstr "network-manager"
+msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Autodeteksjon av nettverksstatus."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Krever gnome-network-manager og python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Sesjons Behandling"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesjon er lagret på utlogging og gjenopprettes ved pålogging."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Krever python-gnome2."
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Passord for å komme inn i rommet"
+msgstr "Passord kryptering"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passord kan lagres sikkert og ikke bare i klartekst."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Krever gnome-keyring og python-gnome2-desktop."
+msgstr "Krever gnome-keyring og python-gnome2-desktop, eller kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Evne til å koble til servere som bruker SRV records."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Krever dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Krever nslookup for å bruke SRV records."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Stavekontroll"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Stavekontroll av komponerte meldinger."
 
-#: ../src/features_window.py:80
-#, fuzzy
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
-msgstr "Krever python-sexy."
+msgstr "Krever libgtkspell."
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
-msgstr "Kunngjøringer"
+msgstr "Varslinger"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Passiv påminnelse for nye hendelser."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7487,52 +7481,31 @@ msgstr ""
 "Krever python-notify eller alternativt python-dbus i samarbeid med "
 "notification-daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Trayicon"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Et ikon i systemtray som viser gjeldende tilkoblingsstatus."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Krever python-gnome2-extras eller kompilert trayicon modul fra Gajims "
-"kildekode."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Krever PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
-msgstr "_Justér etter status"
+msgstr "Automatisk status"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Evnen til å måle inaktiv tid for å kunne sette auto status."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
-msgstr ""
+msgstr "Krever libxss biblioteket."
 
-#: ../src/features_window.py:93
-#, fuzzy
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
-msgstr "Krever python-gnome2."
+msgstr "Krever python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformer LaTeX uttrykk mellom $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7540,7 +7513,7 @@ msgstr ""
 "Krever texlive-latex-base og dvipng. Du må sette 'use_latex' til True i "
 "Avansert Konfigurasjons Editoren."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7548,25 +7521,23 @@ msgstr ""
 "Krever texlive-latex-base og dvipng (Alt er i MikTeX). Du må sette "
 "'use_latex' til True i Avansert Konfigurasjons Editoren."
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "Ende til Ende Kryptering"
+msgstr "Ende til Ende meldingskryptering"
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Kryptering av samtalemeldinger."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Krever python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7574,24 +7545,37 @@ msgstr ""
 "Generer XHTML ut fra RST kode (see http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Krever python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Faner og klikkbare linker"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Muligheten for å ha klikkbare URLer i samtale og gruppesamtale vindu faner."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Krever python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Krever python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Funksjonalitet"
 
@@ -7607,107 +7591,106 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Fil overføring avbrutt"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottaker:  %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
-msgstr "Fil Overføring Stoppet"
+msgstr "Fil overføring stoppet"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Beskrivelse:"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7715,33 +7698,33 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7749,32 +7732,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pause"
 
@@ -7785,27 +7768,23 @@ msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "importering av PyGTK feilet: %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim trenger PyGTK 2.8 eller høyere"
+msgstr "Gajim trenger PyGTK 2.12 eller høyere"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim tenger PyGTK 2.8 eller høyere for å kjøre. Avslutter..."
+msgstr "Gajim tenger PyGTK 2.12 eller høyere for å kjøre. Avslutter..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim trenger GTK 2.8 eller høyere"
+msgstr "Gajim trenger GTK 2.12 eller høyere"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim trenger GTK 2.8 eller høyere for å kjøre. Avslutter..."
+msgstr "Gajim trenger GTK 2.12 eller høyere for å kjøre. Avslutter..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7843,11 +7822,11 @@ msgstr ""
 "på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7855,465 +7834,28 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Passordsetning Kreves"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Ingen GPG nøkkel tildelt"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Feil Passordsetning"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Ditt ønskede kallenavn i gruppesamtale %s er i bruk eller er registrert av "
-"en annen samtalebruker.\n"
-"Vennligst skriv et annet kallenavn under:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Godtar du denne forespørselen?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Godtar du denne forespørselen på konto %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Tilkobling Feilet"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Feil %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "feil ved sending %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Abonnerings Forespørsel"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Godkjenningsforespørel akseptert"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Du vil alltid se han eller henne som frakoblet.\n"
-"Ønsker du å fjerne han eller henne fra din kontakt liste?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Fjern Abonnement"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt med \"%s\" kan ikke opprettes"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s er nå kjent som %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s er nå %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s har satt tittel til %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Enhver deltaker får log å se din fulle JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Rommet viser nå utilgjengelig medlem"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "rommet viser nå ikke utilgjengelige medlemmer"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "En non-privacy-related rom konfigurasjons ending har skjedd"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Rom logging er nå påslått"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Rom logging er nå avslått"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Rommet er nå ikke-anonymisert"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Rommet er nå semi-anonymisert"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Romet er nå full-anonymisert"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Et passord kreves for å bli med i rommet %s. Vennligst skriv det."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
-"som kjører eller den returnerte feil passord frase.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Passord setningen din er ikke riktig"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Passord setningen din er ikke riktig"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG fungerer ikke"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
-"meldinger."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Ikke spør meg igjen"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring er installert men ikke \t\t\t\t\t\t\tstartet riktig (system "
-"variabel sikkert ikke \t\t\t\t\t\t\tsatt riktig)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Ny e-post på %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Du har %d ny e-post samtale"
-msgstr[1] "Du har %d nye e-post samtaler"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Fra: %(from_address)s\n"
-"Tittel: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s ønsker å sende deg en fil."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Fjerner kontakt fra kontaktlisten"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Feil under lesing av fil:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Du har vellykket sendt %(filename)s til %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Ikke mulig å dekryptere melding fra %s\n"
-"Den kan ha blitt endret."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Klarer ikke å dekryptere meldingen"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Brukernavn Konflikt"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Feil."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Ressurs Konflikt"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
-"et annet"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Feil ved verifisering av SSL sertifikat"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Det skjedde en feil i verifisering av SSL sertifikatet for din jabber "
-"server: %(error)s\n"
-"Ønsker du fortsatt å koble til denne serveren?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignorer denne feilen for dette sertifikatet"
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "SSL sertifikats feil"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Det ser ut som SSL sertifikatet har endret seg ellers blir din tilkobling "
-"hacket.\n"
-"Gammelt fingeravtrykk: %(old)s\n"
-"Nytt fingeravtrykk: %(new)s\n"
-"\n"
-"Ønsker du fortsatt å koble til og oppdatere fingeravtrykket?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Usikker tilkobling"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
-"at du ønsker å gjøre det?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Ja, jeg ønsker å koble til usikkert"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
-"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
-"ønsker å fortsette?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "PEP noden ble ikke fjernet"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Uttryksikoner avslått"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
-"blitt slått av. "
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Ditt konfigurerte følelsesikon tema kunne ikke lastes. Du må kanskje "
-"oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
-"Emoticons for flere detaljer."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Kan ikke lagre dine innstillinger og valg"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Spretter opp et nytt vindu med den neste ventende hendelsen"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8321,51 +7863,51 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "melding"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8373,47 +7915,43 @@ msgstr ""
 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Endrer status på konto eller kontoer"
+msgstr "Endrer prioritet på konto eller kontoer"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Priorit_et:"
+msgstr "prioritet"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Jeg ønsker å _registrere en ny konto"
+msgstr "prioritet du ønsker å gi til kontoen"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
-"til alle kontoer som har \"synkroniser med global status\" valget påslått"
+"endre prioritet til en konto. Dersom uspesifisert, endre status til alle "
+"kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8423,30 +7961,30 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8456,137 +7994,137 @@ msgstr ""
 "nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sender nye meldinger to en gruppesamtale som du er tilkoblet."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på innstillingen, 'verdi' er gjeldende innstilling"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Legger til en ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer innstillinger (globale innstillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8594,72 +8132,71 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI til håndgrep"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Konto som du ønsker å benytte for å håndtere det"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "meldings innhold"
+msgstr "Meldings innhold"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "passord"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8668,15 +8205,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ut som Gajim ikke kjører, så du kan ikke bruke gajim-remote. "
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8685,16 +8222,16 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8703,7 +8240,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8712,7 +8249,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8721,7 +8258,7 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Feil uri"
 
@@ -8750,152 +8287,176 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke lenger i samtalerommet \"%(room)s\" eller \"%(nick)s\" har dratt."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Enhver deltaker får log å se din fulle JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har satt eller endret ditt rom kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s er nå kjent som %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilknytning for %(nick)s har blitt satt til %(affiliation)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilknutning for %(nick)s har blitt satt til %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s er nå %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av samtalerommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Dersom du lukker dette vinduet, så vil du bli koblet fra dette samtalerommet."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Ikke spør meg igjen"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8903,22 +8464,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -8944,57 +8505,471 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Feil under traversering av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Kunne ikke skrive til %s. Sesjons Håndterings støtte vil ikke virke."
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Alltid sjekk om Gajim er standard Jabber klient ved oppstart"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Bilde kan ikke lagres i %(type)s format. Lagre som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ditt ønskede kallenavn i gruppesamtale %s er i bruk eller er registrert av "
+"en annen samtalebruker.\n"
+"Vennligst skriv et annet kallenavn under:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Alltid bruk dette kallenavnet når det er en konflikt"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Godtar du denne forespørselen?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Godtar du denne forespørselen på konto %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Tilkobling Feilet"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Feil %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "feil ved sending %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Abonnerings forespørsel"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Godkjenningsforespørel akseptert"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Du vil alltid se han eller henne som frakoblet.\n"
+"Ønsker du å fjerne han eller henne fra din kontakt liste?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Fjern Abonnement"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt med \"%s\" kan ikke opprettes"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s har satt tittel til %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Rommet viser nå utilgjengelig medlem"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "rommet viser nå ikke utilgjengelige medlemmer"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "En non-privacy-related rom konfigurasjons ending har skjedd"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Rom logging er nå påslått"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Rom logging er nå avslått"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Rommet er nå ikke-anonymisert"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Rommet er nå semi-anonymisert"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Romet er nå full-anonymisert"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Et passord kreves for å bli med i rommet %s. Vennligst skriv det."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
+"som kjører eller den returnerte feil passord frase.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Passord setningen din er ikke riktig"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "OpenGPG Passordord er ikke riktig"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG nøkkel ikke tiltrodd"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"GPG nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
+"virkelig å kryptere denne meldingen?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring er installert men ikke \t\t\t\tstartet riktig (system variabel "
+"sikkert ikke \t\t\t\tsatt riktig)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ny e-post på %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Du har %d ny e-post samtale"
+msgstr[1] "Du har %d nye e-post samtaler"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Fra: %(from_address)s\n"
+"Tittel: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s ønsker å sende deg en fil."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Kontakten stoppet overføring"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Feil under åpning av fil"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Du har vellykket sendt %(filename)s til %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Ikke mulig å dekryptere melding fra %s\n"
+"Den kan ha blitt endret."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Klarer ikke å dekryptere meldingen"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Brukernavn Konflikt"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Feil."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Ressurs Konflikt"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
+"et annet"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s ønsker å sende deg en fil."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Fil Overførings Forespørsel"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Feil ved verifisering av SSL sertifikat"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Det skjedde en feil i verifisering av SSL sertifikatet for din jabber "
+"server: %(error)s\n"
+"Ønsker du fortsatt å koble til denne serveren?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignorer denne feilen for dette sertifikatet"
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "SSL sertifikats feil"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Det ser ut som SSL sertifikatet for konto %(account)s har endret seg eller "
+"din tilkobling blir hacket.\n"
+"Gammelt fingeravtrykk: %(old)s\n"
+"Nytt fingeravtrykk: %(new)s\n"
+"\n"
+"Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Usikker tilkobling"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
+"at du ønsker å gjøre det?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, jeg ønsker å koble til usikkert"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
+"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
+"ønsker å fortsette?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP noden ble ikke fjernet"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Uttryksikoner avslått"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
+"blitt slått av. "
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Ditt konfigurerte følelsesikon tema kunne ikke lastes. Du må kanskje "
+"oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
+"Emoticons for flere detaljer."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Kan ikke lagre dine innstillinger og valg"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Passordsetning Kreves"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "GPG nøkkel utgått"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Din GPG nøkkel er utgått, du vil bli koblet til %s uten OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Feil Passordsetning"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
@@ -9009,7 +8984,7 @@ msgstr "Kontakter"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Dato"
 
@@ -9020,7 +8995,7 @@ msgstr "Kallenavn"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Melding"
 
@@ -9044,192 +9019,188 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Ønsker du virkelig å slette loggene til den valgte kontakten?"
 msgstr[1] "Ønsker du virkelig å slette loggene fra de valgte kontaktene?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Disk Feil"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Feil melding: %s"
+msgstr "Feil: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Feil."
+msgstr "Feil"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Du er ikke tilkoblet til serveren"
+msgstr "Du kommer til å lukke flere tabber"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Ønsker du virkelig å slette den valgte meldingen?"
+msgstr "Ønsker du virkelig å lukke alle?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- meldinger vil bli logget"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- -meldinger vil ikke bli logget"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra gruppesamtalerom %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Melding fra %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:568
 msgid "Ignore"
-msgstr "_Ignorer"
+msgstr "Ignorer"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informasjon motatt"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informasjon IKKE publisert"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9237,48 +9208,53 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9286,28 +9262,27 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Virkelig avslutte Gajim?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
+msgstr "Er du sikker på at du vil avslutte Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Alltid lukk Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9315,16 +9290,16 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått og kontakten er i kontaktlisten."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9332,11 +9307,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9345,69 +9320,71 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
-"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+"Du skal til å blokkere en kontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Denne kontakten vil se deg som frakoblet og du vil ikke motta meldinger han "
+"sender deg."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ønsker du å fjerne gruppen %s fra kontaktlisten?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Også fjerne alle kontakter i denne gruppen fra kontaktlisten"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
+"Du er i ferd med å fjerne \"%(name)s\" (%(jid)s) fra din kontaktliste.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9416,11 +9393,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9428,16 +9405,16 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9447,33 +9424,35 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+"Du skal til å sende en individuell status. Er du sikker på at du ønsker å "
+"fortsette?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Denne kontakten vil midlertidig se deg som %(status)s, men bare til du "
+"endrer status igjen. Da vil han se din nye globale status. "
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du må lage en konto før du kan snakke med andre kontakter."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9481,13 +9460,13 @@ msgstr ""
 "Din server støtter ikke lagring av metakontakt informasjon, så denne "
 "informasjonen vil ikke bli lagret til neste tilkobling."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9497,23 +9476,23 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Ønsker du å sende denne filen til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Send %s"
+msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -9523,157 +9502,156 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Koble ifra"
+msgstr "_Koble til på nytt"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Venter på resultater"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Feil i motatt dataskjema"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Ingen resultater"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Disk SkriveFeil"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9688,7 +9666,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9703,116 +9681,116 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av denne samtalegruppen"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [blokkert]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [minimert]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Siste status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Sang:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9820,29 +9798,28 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
-msgstr "?Client:Ukjent"
+msgstr "?Time:Ukjent"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9850,7 +9827,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9858,13 +9835,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9872,18 +9849,70 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Innkommende melding:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Utgående melding:"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Verten %s du konfigurerte har ft_add_hosts_to_send i avanserte valg og er "
+#~ "ikke gyldig, så den ignoreres."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP passordsetning ble ikke gitt"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr "For å sende og motta meldinger må du koble til på nytt."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke "
+#~ "sendes."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Denne meldingen er kryptert]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i dager siden"
+
+#~ msgid "Trayicon"
+#~ msgstr "Trayicon"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Et ikon i systemtray som viser gjeldende tilkoblingsstatus."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Krever python-gnome2-extras eller kompilert trayicon modul fra Gajims "
+#~ "kildekode."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Krever PyGTK >= 2.10."
+
+#~ msgid "gtk-ok"
+#~ msgstr "Lukk"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Legg til Spesiell _Alarm"
 
@@ -10506,9 +10535,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "A_fter nickname:"
 #~ msgstr "E_tter kallenavn:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "F_ør kallenavn:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Etter tid:"
 
diff --git a/po/pl.po b/po/pl.po
index cc8c9b6f1..0ea3fd838 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,23 +1,24 @@
-# Polish translations for gajim package
-# Polska wersja językowa pakietu gajim
-# Copyright (C) 2005 THE gajim'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gajim package.
-# Automatically generated, 2005.
-# 
-# 
+# Polish translations for gajim package
+# Polska wersja językowa pakietu gajim
+# Copyright (C) 2005 THE gajim'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gajim package.
+# Automatically generated, 2005.
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-19 23:59+0200\n"
-"Last-Translator: Sławomir Domagała <godlark@gmail.com>\n"
-"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2010-01-01 20:42+0100\n"
+"Last-Translator: Dominik Kozaczko <dominik@kozaczko.info>\n"
+"Language-Team: Polish <dominik@kozaczko.info, translation-team-pl@lists.sourceforge.net>\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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Language: Polish\n"
+"X-Poedit-Country: POLAND\n"
 
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
@@ -106,9 +107,8 @@ msgstr ""
 "Odcisk klucza SHA1 tego certyfikatu:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Używaj aut_oryzacji serwera proxy"
+msgstr "Anonimowa autentykacja"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -244,15 +244,8 @@ msgid "Chan_ge Password"
 msgstr "Z_mień hasło"
 
 #: ../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 ""
-"Zaznaczenie tej opcji spowoduje łączenia na porcie 5223 gdzie większość "
-"serwerów udostępnia usługę SSL. Gajim używa szyfrowania TLS domyślnie, jeśli "
-"tylko serwer daje taką możliwość. Ta opcja wyłącza TLS"
+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 "Zaznaczenie tej opcji spowoduje łączenia na porcie 5223 gdzie większość serwerów udostępnia usługę SSL. Gajim używa szyfrowania TLS domyślnie, jeśli tylko serwer daje taką możliwość. Ta opcja wyłącza TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
 #: ../data/glade/accounts_window.glade.h:14
@@ -267,8 +260,7 @@ msgstr "Kliknij, aby zmienić hasło dla konta"
 #: ../data/glade/account_modification_window.glade.h:13
 #: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta"
+msgstr "Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta"
 
 #: ../data/glade/account_modification_window.glade.h:14
 #: ../data/glade/accounts_window.glade.h:18
@@ -282,9 +274,13 @@ msgstr "Zmień informacje o sobie..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5
+#: ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112
+#: ../src/notify.py:560
+#: ../src/notify.py:581
+#: ../src/notify.py:620
+#: ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -293,9 +289,12 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52
+#: ../src/common/contacts.py:135
+#: ../src/dialogs.py:111
+#: ../src/dialogs.py:121
+#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Ogólne"
 
@@ -305,48 +304,27 @@ msgstr "Nazwa hosta: "
 
 #: ../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 ""
-"Jeżeli opcja jest aktywna, Gajim roześle kilka dodatkowych adresów IP poza "
-"Twoim, tak aby przesyłanie plików przebiegało sprawniej."
+msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
+msgstr "Jeżeli opcja jest aktywna, Gajim roześle kilka dodatkowych adresów IP poza Twoim, tak aby przesyłanie plików przebiegało sprawniej."
 
 #: ../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 ""
-"Zaznaczenie tej opcji spowoduje wysyłanie pakietów podtrzymujących "
-"połączenie, co zapobiega rozłączaniu"
+msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
+msgstr "Zaznaczenie tej opcji spowoduje wysyłanie pakietów podtrzymujących połączenie, co zapobiega rozłączaniu"
 
 #: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Zaznaczanie tej opcji spowoduje przechowywanie hasła w pliku ~/.gajim/config "
-"z prawem do odczytu tylko dla ciebie"
+msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
+msgstr "Zaznaczanie tej opcji spowoduje przechowywanie hasła w pliku ~/.gajim/config z prawem do odczytu tylko dla ciebie"
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-msgid ""
-"If checked, Gajim, when launched, will automatically connect to jabber using "
-"this account"
-msgstr ""
-"Zaznaczanie tej opcji spowoduje automatyczne łączenie z siecią Jabber z "
-"wykorzystaniem tego konta"
+msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
+msgstr "Zaznaczanie tej opcji spowoduje automatyczne łączenie z siecią Jabber z wykorzystaniem tego konta"
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-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 ""
-"Jeśli jest zaznaczone, to każda zmiana statusu globalnego (ustawianego z "
-"menu na dole okna listy kontaktów) wpłynie odpowiednio na status tego konta"
+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 "Jeśli jest zaznaczone, to każda zmiana statusu globalnego (ustawianego z menu na dole okna listy kontaktów) wpłynie odpowiednio na status tego konta"
 
 #: ../data/glade/account_modification_window.glade.h:25
 #: ../data/glade/accounts_window.glade.h:31
@@ -354,21 +332,32 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35
+#: ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3
+#: ../src/config.py:1158
+#: ../src/config.py:1261
+#: ../src/config.py:1550
+#: ../src/config.py:1555
+#: ../src/config.py:2103
+#: ../src/config.py:2182
+#: ../src/config.py:2195
+#: ../src/config.py:3396
+#: ../src/config.py:3469
+#: ../src/dialogs.py:308
+#: ../src/dialogs.py:310
+#: ../src/dialogs.py:513
+#: ../src/dialogs.py:526
+#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Żaden"
 
@@ -389,14 +378,8 @@ msgstr "Priory_tet:"
 
 #: ../data/glade/account_modification_window.glade.h:33
 #: ../data/glade/accounts_window.glade.h:40
-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 ""
-"Priorytet służy do określenia, który program ma odbierać wiadomości z "
-"serwera gdy dwa klienty (lub więcej) są połączone z tym samym kontem. Ten "
-"który ma wyższy priorytet, będzie odbierał wiadomości"
+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 "Priorytet służy do określenia, który program ma odbierać wiadomości z serwera gdy dwa klienty (lub więcej) są połączone z tym samym kontem. Ten który ma wyższy priorytet, będzie odbierał wiadomości"
 
 #: ../data/glade/account_modification_window.glade.h:34
 #: ../data/glade/accounts_window.glade.h:41
@@ -414,18 +397,8 @@ msgstr "Za_sób: "
 
 #: ../data/glade/account_modification_window.glade.h:37
 #: ../data/glade/accounts_window.glade.h:44
-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 ""
-"Informację wysłano do serwera w celu rozdzielenia tego samego JID na dwie "
-"lub więcej części, w zależności od liczby klientów połączonych z serwerem z "
-"tego samego konta. Możesz być połączony z z tym samym kontem z informacjami "
-"'Dom' i 'Praca' w tym samym czasie. Klient o najwyższym będzie odbierał "
-"wiadomości (patrz niżej)"
+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 "Informację wysłano do serwera w celu rozdzielenia tego samego JID na dwie lub więcej części, w zależności od liczby klientów połączonych z serwerem z tego samego konta. Możesz być połączony z z tym samym kontem z informacjami 'Dom' i 'Praca' w tym samym czasie. Klient o najwyższym będzie odbierał wiadomości (patrz niżej)"
 
 #: ../data/glade/account_modification_window.glade.h:38
 msgid "Save _passphrase (insecure)"
@@ -482,17 +455,12 @@ msgid "Accounts"
 msgstr "Konta"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Używaj aut_oryzacji serwera proxy"
+msgstr "Używaj autoryzacji serwera proxy"
 
 #: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Po uaktywnieniu tej opcji Gajim zapyta przed wysłaniem hasła przez "
-"nieszyfrowane połączenie."
+msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
+msgstr "Po uaktywnieniu tej opcji Gajim zapyta przed wysłaniem hasła przez nieszyfrowane połączenie."
 
 #: ../data/glade/accounts_window.glade.h:17
 msgid "Co_nnect on Gajim startup"
@@ -510,22 +478,20 @@ msgstr "Imię:"
 
 #: ../data/glade/accounts_window.glade.h:24
 msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Zaznaczenie tej opcji spowoduje pobieranie hasła z agenta GPG, np. Seahorse"
+msgstr "Zaznaczenie tej opcji spowoduje pobieranie hasła z agenta GPG, np. Seahorse"
 
 #: ../data/glade/accounts_window.glade.h:29
 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 ""
-"Jeżeli domyślny port, na którym przyjmowane są nadchodzące wiadomości nie "
-"odpowiada ci, możesz wskazać numer portu, jakiego chcesz używać.\n"
+"Jeżeli domyślny port, na którym przyjmowane są nadchodzące wiadomości nie odpowiada ci, możesz wskazać numer portu, jakiego chcesz używać.\n"
 "Konieczna stać się może ponowna konfiguracja firewalla."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -539,7 +505,8 @@ msgid "Mer_ge accounts"
 msgstr "_Połącz konta"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42
+#: ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
@@ -704,9 +671,7 @@ msgstr "<b>Opis</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr ""
-"<b>UWAGA:</b> powienieneś ponownie uruchomić program by zastosować ostatnie "
-"ustawienia"
+msgstr "<b>UWAGA:</b> powienieneś ponownie uruchomić program by zastosować ostatnie ustawienia"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -790,7 +755,8 @@ msgid "All statuses"
 msgstr "Dowolny status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../src/common/commands.py:101
+#: ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Zaraz wracam"
 
@@ -857,8 +823,7 @@ msgid "When "
 msgstr "Jeżeli "
 
 #: ../data/glade/advanced_notifications_window.glade.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr "_Migaj obramowaniem zminimalizowanego okna rozmowy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
@@ -935,7 +900,8 @@ msgstr "Ostatnio zmodyfikowany:"
 msgid "New entry received"
 msgstr "Odebrano nowy wpis"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5
+#: ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Otrzymałeś nowy artykuł:"
 
@@ -979,11 +945,13 @@ msgstr "Wpisz nowe hasło:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Wpisz nowy opis statusu:</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Aktywność:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Nastrój:"
 
@@ -1063,7 +1031,6 @@ msgid "Assign Open_PGP Key..."
 msgstr "Przypisz klucz Open_PGP..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
 msgstr "Wykonaj komendę..."
 
@@ -1073,8 +1040,9 @@ msgstr "Modyfikuj _grupy..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "Za_proś do"
 
@@ -1087,8 +1055,9 @@ msgid "Remo_ve"
 msgstr "Us_uń"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9
+#: ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Wyślij odrębny status"
 
@@ -1121,8 +1090,10 @@ msgid "_Allow him/her to see my status"
 msgstr "_Pozwól mu/jej widzieć swój status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370
+#: ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Zablokuj"
 
@@ -1133,7 +1104,8 @@ msgstr "_Zabroń mu/jej widzieć twój status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21
+#: ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Historia"
 
@@ -1154,8 +1126,10 @@ msgid "_Subscription"
 msgstr "_Autoryzacja"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13
+#: ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364
+#: ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Cofnij blokadę"
 
@@ -1232,18 +1206,15 @@ msgid "Shows a list of file transfers between you and others"
 msgstr "Wyświetla listę przesłanych plików"
 
 #: ../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 ""
-"To działanie spowoduje usunięcie przesyłu pliku z listy. Jeśli jest on "
-"aktywnyto najpierw zostanie zatrzymany a dopiero potem usunięty"
+msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
+msgstr "To działanie spowoduje usunięcie przesyłu pliku z listy. Jeśli jest on aktywnyto najpierw zostanie zatrzymany a dopiero potem usunięty"
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13
+#: ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -1251,7 +1222,8 @@ msgstr "_Kontynuuj"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15
+#: ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający ten plik"
 
@@ -1279,7 +1251,8 @@ msgstr ""
 "Kontakt\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Wytłuszczone"
 
@@ -1299,11 +1272,13 @@ msgstr "Wybieranie motywów dla Gajim"
 msgid "Gone"
 msgstr "Zniknął"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Kursywa"
 
@@ -1351,7 +1326,8 @@ msgstr "Zmień _temat..."
 msgid "Configure _Room..."
 msgstr "Konfiguruj _pokój..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "Dodaj _zakładkę dla tego pokoju"
 
@@ -1415,12 +1391,14 @@ msgstr "_Głos"
 msgid "Create new post"
 msgstr "Utwórz nowy wpis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/glade/groups_post_window.glade.h:2
+#: ../src/common/helpers.py:244
 msgid "From"
 msgstr "Od"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../data/glade/groups_post_window.glade.h:3
+#: ../src/history_manager.py:195
 #: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Temat"
@@ -1428,20 +1406,19 @@ msgstr "Temat"
 #: ../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>UWAGA:</b>\n"
-"Jeżeli chcesz usuwać wiele danych, upewnij się najpierw że Gajim nie jest "
-"uruchomiony. Unikaj też usuwania historii rozmów kontaktów, z którymi "
-"właśnie rozmawiasz."
+"Jeżeli chcesz usuwać wiele danych, upewnij się najpierw że Gajim nie jest uruchomiony. Unikaj też usuwania historii rozmów kontaktów, z którymi właśnie rozmawiasz."
 
 #: ../data/glade/history_manager.glade.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Witaj w menedżerze historii rozmów Gajima</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4
+#: ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Usuń"
 
@@ -1455,24 +1432,20 @@ msgstr "Historia rozmów"
 
 #: ../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 ""
-"Menedżer logów nie powinien być używany do przeglądania logów. Jeżeli "
-"szukasz tej funkcjonalności, użyj okna historii rozmów.\n"
+"Menedżer logów nie powinien być używany do przeglądania logów. Jeżeli szukasz tej funkcjonalności, użyj okna historii rozmów.\n"
 "\n"
-"Programu tego używać należy do usuwania lub eksportowania logów. Możesz "
-"wskazać logi po lewej stronie okna lub przeszukać ich bazę używając "
-"poniższego pola."
+"Programu tego używać należy do usuwania lub eksportowania logów. Możesz wskazać logi po lewej stronie okna lub przeszukać ich bazę używając poniższego pola."
 
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Szukaj w bazie"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1
+#: ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Historia rozmowy"
 
@@ -1496,11 +1469,11 @@ msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "Dodaj pokój do zakładek (Ctrl+B)"
+msgstr "Dodaj pokój do zakładek"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
@@ -1527,8 +1500,9 @@ msgstr "Ostatnio:"
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9
+#: ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Dołącz"
 
@@ -1556,7 +1530,8 @@ msgstr "Minimalizuj po automatycznym wejściu"
 msgid "Print status:"
 msgstr "Wyświetlaj status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../src/config.py:1663
 msgid "Server:"
 msgstr "Serwer:"
 
@@ -1667,17 +1642,25 @@ msgid "Show a list of formattings"
 msgstr "Pokaż formatowanie tekstu"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr "Pokaż menu zaawansowanych funkcji (Alt+A)"
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Pokaż menu zaawansowanych funkcji (Alt+D)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Pokaż profil kontaktu (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr "Przełącz sesję audio"
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr "Przełącz sesję wideo"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Wyślij"
 
@@ -1770,9 +1753,7 @@ msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
 
 #: ../data/glade/preferences_window.glade.h:25
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/"
-"niewidoczny"
+msgstr "Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/niewidoczny"
 
 #: ../data/glade/preferences_window.glade.h:26
 msgid "Allow sound when I'm _busy"
@@ -1793,7 +1774,7 @@ msgstr ""
 "Automatyczne wykrywanie przy każdym uruchomieniu Gajima\n"
 "Zawsze używaj domyślnych aplikacji GNOME\n"
 "Zawsze używaj domyślnych aplikacji KDE\n"
-"Zawsze używaj domyślnych aplikacji XFCE\n"
+"Zawsze używaj domyślnych aplikacji Xfce\n"
 "Własne"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1802,14 +1783,21 @@ msgstr "Wiadomość:"
 
 #: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
-"Przy starcie zawsze sprawdzaj czy Gajim jest _domyślnym klientem Jabbera"
+msgstr "Przy starcie zawsze sprawdzaj czy Gajim jest _domyślnym klientem Jabbera"
 
 #: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Konfiguruj kolor i czcionkę interfejsu"
 
 #: ../data/glade/preferences_window.glade.h:36
+msgid "Contact's message:"
+msgstr "Wiadomość:"
+
+#: ../data/glade/preferences_window.glade.h:37
+msgid "Contact's nickname:"
+msgstr "Pseudonim kontaktu:"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1823,206 +1811,123 @@ msgstr ""
 "Oddzielne okno rostera, rozmowy grupowane według konta\n"
 "Oddzielne okno rostera, rozmowy grupowane według typu"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Wyświetlaj aktywność kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Wyświetlaj _dodatkowe informacje o poczcie e-mail"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Wyświetlaj muzyczne ikonki kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Wyświetlaj awatary kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Wyświetlaj nastroje kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Wyświetlaj _opisy statusu kontaktu na liście kontaktów"
 
-#: ../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 "
-"display in chat windows."
-msgstr ""
-"Gajim może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. "
-"W tym miejscu możesz zdecydować, które z tych danych chcesz wyświetlać w "
-"oknie rozmowy."
-
-#: ../data/glade/preferences_window.glade.h:48
-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 może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. "
-"W tym miejscu możesz zdecydować, jakie dane chcesz wysyłać do rozmówcy."
-
 #: ../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 powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
-"kontaktach które zmieniają status na Rozłączony"
+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 może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. W tym miejscu możesz zdecydować, które z tych danych chcesz wyświetlać w oknie rozmowy."
 
-#: ../data/glade/preferences_window.glade.h:51
-msgid "Hide all buttons in chat windows"
-msgstr "Ukryj przyciski w oknie rozmowy"
+#: ../data/glade/preferences_window.glade.h:50
+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 może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. W tym miejscu możesz zdecydować, jakie dane chcesz wysyłać do rozmówcy."
 
-#: ../data/glade/preferences_window.glade.h:52
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
-"używasz"
+#: ../data/glade/preferences_window.glade.h:51
+msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
+msgstr "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o kontaktach które zmieniają status na Rozłączony"
 
 #: ../data/glade/preferences_window.glade.h:53
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał "
-"informacje o nadawcach nowej poczty w twojej skrzynce"
+msgid "Hide all buttons in chat windows"
+msgstr "Ukryj przyciski w oknie rozmowy"
 
 #: ../data/glade/preferences_window.glade.h:54
-msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr ""
-"Uaktywnienie tej opcji spowoduje, że Gajim będzie zmieniał status na Zaraz "
-"wracam gdy komputer nie będzie używany."
+msgid "If checked, Gajim will allow others to detect the operation system you are using"
+msgstr "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego używasz"
 
 #: ../data/glade/preferences_window.glade.h:55
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Użycie tej opcji oznacza, że Gajim zmieni status na Niedostępny po dłuższym "
-"okresie bezczynności"
+msgid "If checked, Gajim will also include information about the sender of the new emails"
+msgstr "Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał informacje o nadawcach nowej poczty w twojej skrzynce"
 
 #: ../data/glade/preferences_window.glade.h:56
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy "
-"kontaktów (roster oraz okno czatu)"
+msgid "If checked, Gajim will change status to Away when the computer is unused."
+msgstr "Uaktywnienie tej opcji spowoduje, że Gajim będzie zmieniał status na Zaraz wracam gdy komputer nie będzie używany."
 
 #: ../data/glade/preferences_window.glade.h:57
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod "
-"jego nazwą na liście kontaktów"
+msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
+msgstr "Użycie tej opcji oznacza, że Gajim zmieni status na Niedostępny po dłuższym okresie bezczynności"
 
 #: ../data/glade/preferences_window.glade.h:58
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Zaznaczenie tej opcji spowoduje wyświetlanie aktywności kontaktów z listy "
-"kontaktów"
+msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
+msgstr "Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy kontaktów (roster oraz okno czatu)"
 
 #: ../data/glade/preferences_window.glade.h:59
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Zaznaczenie tej opcji spowoduje wyświetlanie nastrojów w oknie listy "
-"kontaktów (roster oraz okno czatu)"
+msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
+msgstr "Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod jego nazwą na liście kontaktów"
 
 #: ../data/glade/preferences_window.glade.h:60
-msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr ""
-"Zaznaczenie tej opcji spowoduje wyświetlanie muzycznych ikonek w oknie listy "
-"kontaktów (roster oraz okno czatu)"
+msgid "If checked, Gajim will display the activity of contacts in the roster window"
+msgstr "Zaznaczenie tej opcji spowoduje wyświetlanie aktywności kontaktów z listy kontaktów"
 
 #: ../data/glade/preferences_window.glade.h:61
-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 ""
-"Zaznaczenie tej opcji spowoduje, że Gajim będzie podświetlał błędy w pisowni "
-"w oknach rozmów. Jeżeli nie wskazano konkrentego słownika, program użyje "
-"słownika domyślnego."
+msgid "If checked, Gajim will display the mood of contacts in the roster window"
+msgstr "Zaznaczenie tej opcji spowoduje wyświetlanie nastrojów w oknie listy kontaktów (roster oraz okno czatu)"
 
 #: ../data/glade/preferences_window.glade.h:62
-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 ""
-"Zaznacz tę opcję tylko jeśli ktoś spoza listy kontaktów nęka Cię "
-"wiadomościami. Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie "
-"wszystkich wiadomości od osób, których nie masz na liście kontaktów"
+msgid "If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr "Zaznaczenie tej opcji spowoduje wyświetlanie muzycznych ikonek w oknie listy kontaktów (roster oraz okno czatu)"
 
 #: ../data/glade/preferences_window.glade.h:63
-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 ""
-"Po uaktywnieniu tej opcji, Gajim będzie logował wiadomości zaszyfrowane "
-"przez GPG oraz E2E. W przypadku E2E zgodę na logowanie wyrazić musi "
-"rozmówca. Jeżeli zgoda nie zostanie udzielona, wiadomości NIE BĘDĄ logowane."
+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 "Zaznaczenie tej opcji spowoduje, że Gajim będzie podświetlał błędy w pisowni w oknach rozmów. Jeżeli nie wskazano konkrentego słownika, program użyje słownika domyślnego."
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
-msgstr ""
-"Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał "
-"informacje o nowej poczty w twojej skrzynce GMail"
+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 "Zaznacz tę opcję tylko jeśli ktoś spoza listy kontaktów nęka Cię wiadomościami. Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie wszystkich wiadomości od osób, których nie masz na liście kontaktów"
 
 #: ../data/glade/preferences_window.glade.h:65
-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 ""
-"Dzięki tej opcji Gajim będzie używał zestawów ikon charakterystycznych dla "
-"transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
-"dostępny, zaraz wracam, zajęty, itd"
+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 "Po uaktywnieniu tej opcji, Gajim będzie logował wiadomości zaszyfrowane przez GPG oraz E2E. W przypadku E2E zgodę na logowanie wyrazić musi rozmówca. Jeżeli zgoda nie zostanie udzielona, wiadomości NIE BĘDĄ logowane."
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr ""
-"Po uaktywnieniu tej opcji Gajim nie będzie prosił o opis statusu. Zostanie "
-"użyty opis domyślny."
+msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
+msgstr "Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał informacje o nowej poczty w twojej skrzynce GMail"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-msgstr ""
-"Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' "
-"emotikonami graficznymi"
+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 "Dzięki tej opcji Gajim będzie używał zestawów ikon charakterystycznych dla transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu dostępny, zaraz wracam, zajęty, itd"
 
 #: ../data/glade/preferences_window.glade.h:68
+msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
+msgstr "Po uaktywnieniu tej opcji Gajim nie będzie prosił o opis statusu. Zostanie użyty opis domyślny."
+
+#: ../data/glade/preferences_window.glade.h:69
+msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
+msgstr "Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' emotikonami graficznymi"
+
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Loguj _zaszyfrowane wiadomości"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "_Spraw by okna rozmowy były zwarte"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Za_rządzaj..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
@@ -2032,31 +1937,31 @@ msgstr ""
 "Tylko, kiedy wystąpią jakieś zdarzeniaZawsze\n"
 "Zawsze"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Powiadom mnie o kontaktach, które się _logują"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Powiadamiaj o nowej poczcie na koncie _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Zdarzenia"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2066,173 +1971,164 @@ msgstr ""
 "Powiadom mnie o tym\n"
 "Pokaż tylko w rosterze"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
 msgstr "Pokaż _zdarzenie w obszarze powiadamiania"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../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 ""
-"Niektóre wiadomości mogą zawierać dodatkowe atrybuty, jak kolory, czy "
-"formatowanie. Jeżeli ta opcja jest aktywna, Gajim będzie ignorował te "
-"dodatki i wyświetlał czysty tekst."
+#: ../data/glade/preferences_window.glade.h:89
+msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
+msgstr "Niektóre wiadomości mogą zawierać dodatkowe atrybuty, jak kolory, czy formatowanie. Jeżeli ta opcja jest aktywna, Gajim będzie ignorował te dodatki i wyświetlał czysty tekst."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91
+#: ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Zestaw ikon _statusu:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Motyw:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
-"The auto away status message. If empty, Gajim will not change the current "
-"status message\n"
+"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 ""
-"Opis automatycznego opisu statusu \"Zaraz Wracam\". Jeśli pusty, Gajim nie "
-"zmieni obecnego opisu\n"
+"Opis automatycznego opisu statusu \"Zaraz Wracam\". Jeśli pusty, Gajim nie zmieni obecnego opisu\n"
 "$S będzie zastąpione przez poprzedni opis statusu\n"
 "$T będzie zastąpione przez czas, który jesteś nieaktywny"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message\n"
+"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 ""
-"Opis automatycznego opisu statusu \"Nieobecny\". Jeśli pusty, Gajim nie "
-"zmieni obecnego opisu\n"
+"Opis automatycznego opisu statusu \"Nieobecny\". Jeśli pusty, Gajim nie zmieni obecnego opisu\n"
 "$S będzie zastąpione przez poprzedni opis statusu\n"
-"$T będzie zastąpione przez czas, po którym ma zostać ustawiono status "
-"\"Nieobecny\""
+"$T będzie zastąpione przez czas, po którym ma zostać ustawiono status \"Nieobecny\""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Użyj _domyślnej dla systemu"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+msgid "Your message:"
+msgstr "Twoja wiadomość:"
+
+#: ../data/glade/preferences_window.glade.h:105
+msgid "Your nickname:"
+msgstr "Twój pseudonim:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "Automatyczny status '_Zaraz wracam' po:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "Prze_glądarka:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "Wyświetlaj informacje stanie kontaktu:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Emotikony:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "Menadżer _plików:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignoruj wzbogaconą treść w wiadomościach"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "Wiadomość _otrzymana:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "Klient _poczty:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "Automatyczny status '_Nieobecny' po:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Otwórz..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Wysłana wiadomość :"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "Wróć do kolorów _domyślnych"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "Rodzaje powiadomień wysyłanych podczas rozmowy:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Informacja o statusie:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "_Podświetlanie URL:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Zachowanie okna:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "w _konferencji"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "w _liście kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutach"
 
@@ -2265,9 +2161,8 @@ msgid "All"
 msgstr "wszystkim"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "według autoryzacji"
+msgstr "Wszystko (łącznie z zubskrypcją)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2285,7 +2180,8 @@ msgstr "JID"
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12
+#: ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Poufna Lista"
 
@@ -2429,7 +2325,8 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30
+#: ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Rola:</b>"
 
@@ -2489,15 +2386,15 @@ msgstr "Usuń konto z Gajima i z _serwera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380
+#: ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Usuń"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:1
-msgid ""
-"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
-"your roster."
+msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
@@ -2509,14 +2406,13 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-close"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2573,7 +2469,8 @@ msgstr "_Działania"
 msgid "_Contents"
 msgstr "_Zawartość"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18
+#: ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Edycja"
 
@@ -2614,11 +2511,13 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4
+#: ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "Informacje o kontakcie"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5
+#: ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Szukaj"
 
@@ -2638,10 +2537,6 @@ msgstr "Zarejestruj w"
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2691,12 +2586,8 @@ msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autoryzuj kontakt - będzie wówczas wiedział, kiedy jesteś połączony"
 
 #: ../data/glade/subscription_request_window.glade.h:3
-msgid ""
-"Deny authorization from contact so he or she cannot know when you're "
-"connected"
-msgstr ""
-"Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś "
-"połączony"
+msgid "Deny authorization from contact so he or she cannot know when you're connected"
+msgstr "Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś połączony"
 
 #: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
@@ -2848,330 +2739,326 @@ msgstr "Zasoby:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Cofnij potwierdzenie"
 
-#: ../src/adhoc_commands.py:269
-msgid ""
-"You are in process of executing command. Do you really want to cancel it?"
+#: ../src/adhoc_commands.py:296
+msgid "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Jesteś w trakcie wykonywania komendy. Czy na pewno chcesz ją przerwać?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328
+#: ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Usługa wysłała niepoprawne dane"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Klient na %s anulował negocjację sesji"
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Usługa zwróciła komunikat błędu."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktywny"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Nieaktywny"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Zmienna logiczna"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Liczba całkowita"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96
+#: ../src/chat_control.py:879
 msgid "Color"
 msgstr "Kolor"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Nazwa opcji"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Wartość"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Brak)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: ../src/atom_window.py:110
-#, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Otrzymałeś nowy artykuł:"
+#: ../src/atom_window.py:119
+#, python-format
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Otrzymano nowe wpisy (i %d nie wyświetlony):"
+msgstr[1] "Otrzymano nowe wpisy (i %d nie wyświetlone):"
+msgstr[2] "Otrzymano nowe wpisy (i %d nie wyświetlonych):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "angielski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "bretoński"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "czeski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "niemiecki"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "grecki"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "brytyjski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "hiszpański"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "baskijski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "francuski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "chorwacki"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "włoski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "norweski (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "holenderski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "norweski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "polski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "portugalski (Brazylia)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "rosyjski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "serbski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "słowacki"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "szwedzki"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "chiński (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Wybierz słownik"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478
+#: ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479
+#: ../src/chat_control.py:671
 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:820
+#: ../src/chat_control.py:861
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 msgid "Strike"
 msgstr "Przekreślenie"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr "Czcionka:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 msgid "Clear formating"
 msgstr "Usuń formatowanie"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Na pewno wysłać ten plik?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, 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:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411
+#: ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "Szyfrowanie GPG włączone"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436
+#: ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253
+#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060
+#: ../src/dialogs.py:1973
+#: ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610
+#: ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398
+#: ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578
+#: ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194
+#: ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
 msgstr "Ten kontakt nie może przesyłać i odbierać plików."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Ty musisz znać prawdziwy JID kontaktu, aby wysłać jej/jemu plik."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Nieznany wykonawca"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Nieznany tytuł"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Nieznany album"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> w wykonaniu <i>%(artist)s</i>\n"
-"z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, 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:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844
+#: ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Nie ma przypisanego klucza GPG"
 
-#: ../src/chat_control.py:1699
-msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
-msgstr ""
-"Nie ma klucza GPG przypisanego do tego kontaktu. Więc nie możesz szyfrować "
-"wiadomości do tego kontaktu, używając GPG."
+#: ../src/chat_control.py:1845
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
+msgstr "Nie ma klucza GPG przypisanego do tego kontaktu. Więc nie możesz szyfrować wiadomości do tego kontaktu, używając GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "Szyfrowanie GPG wyłączone"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Sesja BĘDZIE logowana"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Sesja NIE BĘDZIE logowana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "jest"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "NIE jest"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "będzie"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "NIE będzie"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 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:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3180,74 +3067,66 @@ msgstr ""
 "%(type)s szyfrowanie %(status)s aktywne %(authenticated)s.\n"
 "Twoja sesja %(logged)s będzie logowana."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Negocjowanie sesji zostało przerwane"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr "i BĘDZIE logowana"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr "i NIE BĘDZIE logowana"
 
-#: ../src/chat_control.py:1923
-msgid ""
-"Remote contact's identity not verified. Click the shield button for more "
-"details."
-msgstr ""
-"Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk "
-"tarczy po więcej szczegółów."
+#: ../src/chat_control.py:2074
+msgid "Remote contact's identity not verified. Click the shield button for more details."
+msgstr "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk tarczy po więcej szczegółów."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113
+#: ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Ta wiadomość NIE została zaszyfrowana"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 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:2235
+#: ../src/chat_control.py:2388
 #, 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:2236
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
-"utracisz tę wiadomość."
-
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2389
+msgid "If you close this tab and you have history disabled, this message will be lost."
+msgstr "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to utracisz tę wiadomość."
+
+#: ../src/chat_control.py:2542
+#: ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483
+#: ../src/common/connection.py:420
+#: ../src/gajim.py:154
+#: ../src/session.py:134
 msgid "Database Error"
 msgstr "Błąd bazy danych"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
-msgid ""
-"The database file (%s) cannot be read. Try to repair it or remove it (all "
-"history will be lost)."
-msgstr ""
-"Plik (%s) bazy danych nie może zostać odczytany. Spróbuj to naprawić lub "
-"usunąć ten plik (cała historia rozmów będzie usunięta)."
+msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
+msgstr "Plik (%s) bazy danych nie może zostać odczytany. Spróbuj to naprawić lub usunąć ten plik (cała historia rozmów będzie usunięta)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ma teraz status %(status)s"
@@ -3256,23 +3135,26 @@ msgstr "%(name)s ma teraz status %(status)s"
 msgid "creating logs database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129
+#: ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s jest plikiem choć powinien być katalogiem"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130
+#: ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148
+#: ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jest katalogiem choć powinien być plikiem"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "tworzenie katalogu %s"
@@ -3317,7 +3199,8 @@ msgstr "Status opisowy"
 msgid "The status has been changed."
 msgstr "Status został zmieniony."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:176
+#: ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Opuść pokoje"
 
@@ -3335,10 +3218,13 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Wybierz pokoje, które chcesz opuścić"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205
+#: ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55
+#: ../src/roster_window.py:809
+#: ../src/roster_window.py:1580
+#: ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Pokoje"
 
@@ -3368,8 +3254,7 @@ msgstr "Pokaż tylko połączone i chętne do rozmowy kontakty."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
-msgstr ""
-"Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
+msgstr "Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
 
 #: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
@@ -3377,13 +3262,11 @@ msgstr "$S (Zaraz wracam z powodu braku aktywności przez $T min.)"
 
 #: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
-msgstr ""
-"$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas bezczynności"
+msgstr "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas bezczynności"
 
 #: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
-msgstr ""
-"Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
+msgstr "Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
 
 #: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
@@ -3391,23 +3274,20 @@ msgstr "$S (Status Nieobecny z powodu bezczynności programu powyżej $T min.)"
 
 #: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
-msgstr ""
-"$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas nieobecności"
+msgstr "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas nieobecności"
 
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
-msgstr ""
-"Kiedy pokazać ikonę w obszarze powiadomienia. Może być 'nigdy', "
-"'podczas_zdarzenia', 'zawsze'."
+msgstr "Kiedy pokazać ikonę w obszarze powiadomienia. Może być 'nigdy', 'podczas_zdarzenia', 'zawsze'."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Niepoprawny pseudonim"
+msgstr "Kolor przychodzącego pseudonimu."
 
 #: ../src/common/config.py:94
+#, fuzzy
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Kolor wychodzącego pseudonimu."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
@@ -3418,19 +3298,16 @@ msgid "Outgoing text color."
 msgstr ""
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "treść informacji o statusie"
+msgstr "Kolor tekstu opisu."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Niepoprawny pseudonim"
+msgstr "Czcionka pseudonimu przychodzącego."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Zmiana pseudonimu"
+msgstr "Czcionka wychodzącego pseudonimu."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
@@ -3441,19 +3318,20 @@ msgid "Outgoing text font."
 msgstr ""
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "treść informacji o statusie"
+msgstr "Czcionka opisu."
 
 #: ../src/common/config.py:105
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+msgid "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106
+#: ../src/common/config.py:482
+#: ../src/common/optparser.py:288
+#: ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499
+#: ../src/gui_interface.py:3251
 msgid "default"
 msgstr "domyślny"
 
@@ -3468,68 +3346,36 @@ msgid ""
 "'never' - never print time."
 msgstr ""
 "'always' - wyświetlaj czas każdej wiadomości.\n"
-"'sometmes' - czas wyświetlany jest w odstępach zdefiniowanych w zmiennej "
-"print_ichat_every_foo_minutes.\n"
+"'sometmes' - czas wyświetlany jest w odstępach zdefiniowanych w zmiennej print_ichat_every_foo_minutes.\n"
 "'never' - nigdy nie wyświetlaj czasu."
 
 #: ../src/common/config.py:114
-msgid ""
-"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-"Wartość \"niedokładności\" od 1 do 4 (0 wyłącza \"okołozegarek"
-"\" [fuzzyclock]). 1 oznacza najbardziej precyzyjne wskazania zegara, 4 "
-"najmniej dokładne. Ustawienie to brane jest pod uwagę jedynie wtedy, gdy "
-"opcja print_time ustawiona jest na 'sometimes'."
+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 "Wartość \"niedokładności\" od 1 do 4 (0 wyłącza \"okołozegarek\" [fuzzyclock]). 1 oznacza najbardziej precyzyjne wskazania zegara, 4 najmniej dokładne. Ustawienie to brane jest pod uwagę jedynie wtedy, gdy opcja print_time ustawiona jest na 'sometimes'."
 
 #: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 
 #: ../src/common/config.py:118
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie "
-"pogrubiony ale bez usuniętych znaków * *."
+msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr "Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie pogrubiony ale bez usuniętych znaków * *."
 
 #: ../src/common/config.py:121
-msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
-msgstr ""
-"Używa znaczników ReStructured oraz formatowania ASCII. Musisz mieć "
-"zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie "
-"http://docutils.sourceforge.net/docs/ref/rst/"
+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 "Używa znaczników ReStructured oraz formatowania ASCII. Musisz mieć zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie http://docutils.sourceforge.net/docs/ref/rst/"
 
 #: ../src/common/config.py:130
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
-"czat)"
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko czat)"
 
 #: ../src/common/config.py:131
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już "
-"używany przez innego uzytkownika czatu"
+msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
+msgstr "Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już używany przez innego uzytkownika czatu"
 
 #: ../src/common/config.py:159
-msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr ""
-"Ta opcja pozwala na zdefiniowanie formatu czasu wyświetlanego w oknie "
-"rozmowy. Na przykład \"[%H:%M] \" spowoduje wyświetlenie szablonu \"[godzina:"
-"minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: "
-"http://docs.python.org/lib/module-time.html"
+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 "Ta opcja pozwala na zdefiniowanie formatu czasu wyświetlanego w oknie rozmowy. Na przykład \"[%H:%M] \" spowoduje wyświetlenie szablonu \"[godzina:minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: http://docs.python.org/lib/module-time.html"
 
 #: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
@@ -3544,12 +3390,8 @@ msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
 
 #: ../src/common/config.py:166
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
-"rozmowy zostanie ponownie otwarta."
+msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
+msgstr "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta rozmowy zostanie ponownie otwarta."
 
 #: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
@@ -3564,18 +3406,12 @@ msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr ""
 
 #: ../src/common/config.py:170
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
 
 #: ../src/common/config.py:172
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
-"zachowanie klienta Mirabilis ICQ)."
+msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
+msgstr "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne zachowanie klienta Mirabilis ICQ)."
 
 #: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -3583,94 +3419,48 @@ msgstr "Ile przechwywać linii dla kombinacji Ctrl+KeyUP."
 
 #: ../src/common/config.py:177
 #, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, "
-"co oznacza użycie wiktionary."
+msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
+msgstr "Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, co oznacza użycie wiktionary."
 
 #: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr ""
-"Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z "
-"wykorzystaniem gajim-remote."
+msgstr "Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z wykorzystaniem gajim-remote."
 
 #: ../src/common/config.py:181
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-"Jeżeli opcja ustawiona jest na True, Gajim nasłuchuje komunikatów D-Bus "
-"wysyłanych przez NetworkManagera i zmienia status poszczególnych kont (o ile "
-"nie mają ustawionej opcji listen_to_network_manager) na False i "
-"synchronizują się ze statusem globalnym) w oparciu o status wykorzystywanego "
-"połączenia sieciowego."
+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 "Jeżeli opcja ustawiona jest na True, Gajim nasłuchuje komunikatów D-Bus wysyłanych przez NetworkManagera i zmienia status poszczególnych kont (o ile nie mają ustawionej opcji listen_to_network_manager) na False i synchronizują się ze statusem globalnym) w oparciu o status wykorzystywanego połączenia sieciowego."
 
 #: ../src/common/config.py:182
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
-"przyjmować wartości all, composing_only, disabled."
+msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może przyjmować wartości all, composing_only, disabled."
 
 #: ../src/common/config.py:183
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Informacje o statusie rozmówcy wyświetlane w oknie rozmowy. Przyjmuje "
-"wartości all, composing_only, disabled."
+msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
+msgstr "Informacje o statusie rozmówcy wyświetlane w oknie rozmowy. Przyjmuje wartości all, composing_only, disabled."
 
 #: ../src/common/config.py:185
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"W przypadku wybrania wyświetlania czasu nie dla każdej wiadomości "
-"(print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać "
-"czas nadejścia nowej wiadomości."
+msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
+msgstr "W przypadku wybrania wyświetlania czasu nie dla każdej wiadomości (print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać czas nadejścia nowej wiadomości."
 
 #: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
 #: ../src/common/config.py:187
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Zapytaj przed zamknięciem karty/okna rozmowy grupowej, która prowadzona jest "
-"na każdym z pokojów wymienionych na liście (nazwy pokojów rozdzielone "
-"spacją)."
+msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
+msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej, która prowadzona jest na każdym z pokojów wymienionych na liście (nazwy pokojów rozdzielone spacją)."
 
 #: ../src/common/config.py:188
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Nigdy nie pytaj przed zamknięciem karty/okna rozmowy grupowej, która "
-"prowadzona jest na dowolnym pokoju obecnym na tej liście (nazwy pokojów "
-"rozdzielone spacją)."
+msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
+msgstr "Nigdy nie pytaj przed zamknięciem karty/okna rozmowy grupowej, która prowadzona jest na dowolnym pokoju obecnym na tej liście (nazwy pokojów rozdzielone spacją)."
 
 #: ../src/common/config.py:189
-msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
-"data (chat, private chat, groupchat that will not be minimized)"
-msgstr ""
-"Spytaj przed zamknięciem zakładki, jeśli po zamknięciu mogą zostać stracone "
-"pewne dane(rozmowy, prywatne rozmowy, grupowe rozmowy, które nie zostaną "
-"zminimalizowane)"
+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 "Spytaj przed zamknięciem zakładki, jeśli po zamknięciu mogą zostać stracone pewne dane(rozmowy, prywatne rozmowy, grupowe rozmowy, które nie zostaną zminimalizowane)"
 
 #: ../src/common/config.py:192
-msgid ""
-"Comma separated list of hosts that we send, in addition of local interfaces, "
-"for File Transfer in case of address translation/port forwarding."
-msgstr ""
-"Oddzielona przecinkami lista hostów, którą wysyłamy w celu przesyłania "
-"plików, w przypadku tłumaczenia adresu/przekierowania portu."
+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:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -3693,95 +3483,48 @@ msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
 #: ../src/common/config.py:205
-msgid ""
-"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
-"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
-"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 przecinkiem. 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."
+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 przecinkiem. 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:214
 msgid "Preview new messages in notification popup?"
 msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
 
 #: ../src/common/config.py:219
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Lista słów oddzielonych średnikami, które będą podświetlane w trakcie "
-"rozmowy w pokoju."
+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:220
-msgid ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-msgstr ""
-"Jeśli ma wartość True, to Gajim jest zamykany po wciśnięciu przycisku X "
-"Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
-"systemowa."
+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 "Jeśli ma wartość True, to Gajim jest zamykany po wciśnięciu przycisku X Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka systemowa."
 
 #: ../src/common/config.py:221
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"Jeśli ma wartość True, Gajim sprawdzi przy każdym uruchomieniu czy jest "
-"domyślnym klientem Jabbera."
+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:222
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Jeśli ma wartość True, Gajim wyświetli ikonę na każdej karcie zawierającej "
-"nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
-"motywu."
+msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
+msgstr "Jeśli ma wartość True, Gajim wyświetli ikonę na każdej karcie zawierającej nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od motywu."
 
 #: ../src/common/config.py:223
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-msgstr ""
-"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."
+msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
+msgstr "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
 #: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Zdefiniuj pozycję avatara na liście kontaktów. Lewo lub prawo"
 
 #: ../src/common/config.py:229
-msgid ""
-"If True, Gajim will ask for avatar each contact that did not have an avatar "
-"last time or has one cached that is too old."
-msgstr ""
-"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."
+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 "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:230
-msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes his or her status and/or his or her status message."
-msgstr ""
-"Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub "
-"opisu statusu przez kontakt, z którym rozmawiasz."
+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 "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:231
-msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
-"longer print status line in groupchats when a member changes his or her "
-"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 ""
-"Zmienna przybiera wartości \"none\", \"all\" oraz \"in_and_out\". W "
-"przypadku ustawienia \"none\", Gajim nie będzie już powiadamiał o zmianie "
-"statusu (lub opisu stanu) przez innego użytkownika czatu. \"all\" spowoduje "
-"wyświetlanie wszystkich wiadomości o statusie każdego użytkownika. Wybranie "
-"\"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu "
-"użytkownika do pokoju lub jego opuszczeniu."
+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 "Zmienna przybiera wartości \"none\", \"all\" oraz \"in_and_out\". W przypadku ustawienia \"none\", Gajim nie będzie już powiadamiał o zmianie statusu (lub opisu stanu) przez innego użytkownika czatu. \"all\" spowoduje wyświetlanie wszystkich wiadomości o statusie każdego użytkownika. Wybranie \"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu użytkownika do pokoju lub jego opuszczeniu."
 
 #: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
@@ -3792,11 +3535,8 @@ msgid "Background color of contacts when they just signed out."
 msgstr "Kolor tła dla kontaktów w trakcie wylogowywania."
 
 #: ../src/common/config.py:236
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
-"Jeżeli opcja ustawiona jest na True, przywrócone wiadomości będą wyświetlane "
-"mniejszą czcionką."
+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:237
 msgid "Don't show avatar for the transport itself."
@@ -3807,58 +3547,37 @@ msgid "Don't show roster in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
 #: ../src/common/config.py:239
-msgid ""
-"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
-"window flash (the default behaviour in most Window Managers) when holding "
-"pending events."
-msgstr ""
-"Jeżeli opcja ta jest aktywna oraz zainstalowano GTK+ i PyGTK w wersji nie "
-"niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
-"okna programu."
+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 "Jeżeli opcja ta jest aktywna oraz zainstalowano GTK+ i PyGTK w wersji nie niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie okna programu."
 
 #: ../src/common/config.py:241
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-msgstr ""
-"Demon Jabberd1.4 nie toleruje wysyłania \"sha info\" podczas wchodzenia do "
-"pokoju chronionego hasłem. Ustaw tą opcję na False aby zabronić Gajimowi "
-"wysyłania takiej informacji."
+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 "Demon Jabberd1.4 nie toleruje wysyłania \"sha info\" podczas wchodzenia do pokoju chronionego hasłem. Ustaw tą opcję na False aby zabronić Gajimowi wysyłania takiej informacji."
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
-"'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 ""
 "Kontroluje zachowanie okna z nowymi wiadomościami.\n"
 "'always' - wszystkie wiadomości wysyłane są do tego samego okna.\n"
-"'always_with_roster' - jak 'always', ale wiadomości znajdują się w tym samym "
-"oknie, co roster.\n"
+"'always_with_roster' - jak 'always', ale wiadomości znajdują się w tym samym oknie, co roster.\n"
 "'never' - każda z wiadomości otrzymuje swoje własne okno.\n"
 "'peracct' - wiadomości dla każdego z kont mają wspólne okno.\n"
-"'pertype' - wiadomości określonego typu (np. rozmowa czy konferencja) mają "
-"wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
-"uruchomić program."
+"'pertype' - wiadomości określonego typu (np. rozmowa czy konferencja) mają wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie uruchomić program."
 
 #: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
-msgstr ""
-"Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
-"oknie rozmowy."
+msgstr "Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w oknie rozmowy."
 
 #: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
-msgstr ""
-"Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu "
-"klawisza ESC."
+msgstr "Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu klawisza ESC."
 
 #: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
@@ -3877,12 +3596,8 @@ 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:251
-msgid ""
-"In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
-msgstr ""
-"Podczas rozmowy grupowej, pokaż nazwę rozmówcy na początku linii tylko "
-"wówczas, gdy poprzednią wiadomość wysłała inna osoba."
+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 "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:252
 msgid "Indentation when using merge consecutive nickname."
@@ -3893,208 +3608,112 @@ msgid "Smooth scroll message in conversation window"
 msgstr "Płynne przewijanie w oknie rozmowy"
 
 #: ../src/common/config.py:254
-msgid ""
-"List of colors, separated by \":\", that will be used to color nicknames in "
-"group chats."
-msgstr ""
-"Lista kolorów, oddzielonych \":\", które używane będą do kolorowania nicków "
-"w oknach czatu."
+msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
+msgstr "Lista kolorów, oddzielonych \":\", które używane będą do kolorowania nicków w oknach czatu."
 
 #: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
-"Kombinacja klawiszy Ctrl-Tab przechodzi do następnej karty, o ile w żadnej z "
-"nich nie ma nieprzeczytanych wiadomości."
+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:256
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
-"Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
+msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
+msgstr "Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
 
 #: ../src/common/config.py:257
-#, fuzzy
-msgid ""
-"Should we show the confirm block contact dialog or not? Empty string means "
-"we never show the dialog."
-msgstr ""
-"Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
-"Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
+msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
+msgstr "Wyświetlać potwierdzenie blokowania kontaktu? Pusta linia oznacza, że potwierdzenie nie będzie wyświetlane."
 
 #: ../src/common/config.py:258
-#, fuzzy
-msgid ""
-"Should we show the confirm custom status dialog or not? Empty string means "
-"we never show the dialog."
-msgstr ""
-"Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
-"Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
+msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
+msgstr "Wyświetlać potwierdzenie statusu indywidualnego? Pusta linia oznacza, że potwierdzenie nie będzie wyświetlane."
 
 #: ../src/common/config.py:259
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
-msgstr ""
-"Jeżeli opcja ustawiona jest na True, w oknie modyfikacji właściwości konta "
-"będziesz mógł korzystać z ujemnych priorytetów. Zauważ, że po zalogowaniu z "
-"ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego "
-"serwera."
+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 "Jeżeli opcja ustawiona jest na True, w oknie modyfikacji właściwości konta będziesz mógł korzystać z ujemnych priorytetów. Zauważ, że po zalogowaniu z ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego serwera."
 
 #: ../src/common/config.py:260
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
-"używał Menedżera bazy kluczy GNOME."
+msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
+msgstr "Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie używał Menedżera bazy kluczy GNOME."
 
 #: ../src/common/config.py:261
-#, fuzzy
-msgid ""
-"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
-"account passwords."
-msgstr ""
-"Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
-"używał Menedżera bazy kluczy GNOME."
+msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
+msgstr "Po włączeniu Gajim użyje aplikacji KDE Wallet do przechowywania haseł (o ile biblioteka kwalletcli jest zainstalowana)."
 
 #: ../src/common/config.py:262
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-"Jeśli opcja ustawiona jest na True, Gajim będzie wyświetlał liczbę "
-"połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz "
-"grupy"
+msgid "If True, Gajim will show number of online and total contacts in account and group rows."
+msgstr "Jeśli opcja ustawiona jest na True, Gajim będzie wyświetlał liczbę połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz grupy"
 
 #: ../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 ""
-"Przyjmuje wartość pustą, 'chat' lub 'normal'. Dwie ostatnie określają czy "
-"Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą "
-"wiadomość"
+msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
+msgstr "Przyjmuje wartość pustą, 'chat' lub 'normal'. Dwie ostatnie określają czy Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą wiadomość"
 
 #: ../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 ""
-"Jeżeli ustawiono na 'True', Gajim przewinie listę kontaktów i wybierze ten "
-"kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu "
-"nie jest już otwarte."
+msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
+msgstr "Jeżeli ustawiono na 'True', Gajim przewinie listę kontaktów i wybierze ten kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu nie jest już otwarte."
 
 #: ../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 ""
-"Jeżeli ustawiono na 'True', Gajim dokona konwersji ciągów zawartych pomiędzy "
-"$$ i $$ do postaci obrazu (z wykorzystaniem dvips) przed wstawieniem ich do "
-"okna rozmowy."
+msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
+msgstr "Jeżeli ustawiono na 'True', Gajim dokona konwersji ciągów zawartych pomiędzy $$ i $$ do postaci obrazu (z wykorzystaniem dvips) przed wstawieniem ich do okna rozmowy."
 
 #: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
-msgstr ""
-"Wymagany jest okres nieaktywności zanim zamknięte zostanie okno zmiany "
-"statusu."
+msgstr "Wymagany jest okres nieaktywności zanim zamknięte zostanie okno zmiany statusu."
 
 #: ../src/common/config.py:267
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
-msgstr ""
-"Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są "
-"usuwane."
+msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
+msgstr "Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są usuwane."
 
 #: ../src/common/config.py:268
-msgid ""
-"If True, notification windows from notification-daemon will be attached to "
-"systray icon."
-msgstr ""
-"Po nadaniu wartości True okna powiadomień będą połączone z obszarem "
-"powiadomień."
+msgid "If True, notification windows from notification-daemon will be attached to systray icon."
+msgstr "Po nadaniu wartości True okna powiadomień będą połączone z obszarem powiadomień."
 
 #: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
 
 #: ../src/common/config.py:270
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
+msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
 msgstr "Zmień rozmiar pokazywanych formuł latex-a."
 
 #: ../src/common/config.py:271
-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. (mailto i xmpp są traktowane oddzielnie)"
+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. (mailto i xmpp są traktowane oddzielnie)"
 
 #: ../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 ""
-"Pytaj o opis statusu \"Niepołączony\" wszystkich niepołączonych kontaktów, "
-"kiedy jest połączenie z kontem. OSTRZEŻENIE: To może być przyczyną wysyłania "
-"wielu zapytań!"
+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 "Pytaj o opis statusu \"Niepołączony\" wszystkich niepołączonych kontaktów, kiedy jest połączenie z kontem. OSTRZEŻENIE: To może być przyczyną wysyłania wielu zapytań!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
-msgstr ""
+msgstr "Jeśli włączony, uzupełnianie w konferencjach będzie działać tak samo, jak w konsoli."
 
 #: ../src/common/config.py:274
-msgid ""
-"When is self contact row displayed. Can be \"always\", \"when_other_resource"
-"\" or \"never\""
+msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
 msgstr ""
 
 #: ../src/common/config.py:286
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"Priorytet ulegnie automatycznej zmianie, wraz ze zmianą statusu. Priorytety "
-"zdefiniowane są opcjach rozpoczynających się od autopriority_*."
+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:294
-msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
-msgstr ""
-"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"
+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:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Jeśli włączone, przywróc ostatni status, który był użyty."
 
 #: ../src/common/config.py:297
-msgid ""
-"If True, Contacts requesting authorization will be automatically accepted."
-msgstr ""
+msgid "If True, Contacts requesting authorization will be automatically accepted."
+msgstr "Jeśli włączony, pytania o autoryzację będą automatycznie akceptowane."
 
 #: ../src/common/config.py:298
-#, fuzzy
-msgid ""
-"If False, this account will be disabled and will not appear in roster window."
-msgstr ""
-"Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
-"oknie rozmowy."
+msgid "If False, this account will be disabled and will not appear in roster window."
+msgstr "Wyłącznie opcji wyłączy konto i ukryje je w oknie kontaktów."
 
 #: ../src/common/config.py:301
-msgid ""
-"If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr ""
-"Po wyłączeniu tej opcji, Gajim nie podpisuje komunikatów o stanach kluczem "
-"GPG, nawet jeśli GPG jest skonfigurowany."
+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:303
 msgid "Enable ESessions encryption for this account."
@@ -4102,21 +3721,14 @@ msgstr "Włączono szyfrowanie ESession dla tego konta."
 
 #: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr ""
-"Czy Gajim powinien automatycznie zaczynać zaszyfrowaną sesje jeśli to "
-"możliwe?"
+msgstr "Czy Gajim powinien automatycznie zaczynać zaszyfrowaną sesje jeśli to możliwe?"
 
 #: ../src/common/config.py:305
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
-msgstr ""
-"Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów połączeń. "
-"Może zawierać tls, ssl lub plain"
+msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
+msgstr "Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów połączeń. Może zawierać tls, ssl lub plain"
 
 #: ../src/common/config.py:306
-msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+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:307
@@ -4125,9 +3737,7 @@ msgstr "Pokaż ostrzeżenie przed użyciem standardowej biblioteki SSL."
 
 #: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
-msgstr ""
-"Lista błędów (rozdzielona spacjami) zawierająca wykaz błędów ssl, które "
-"program będzie ignorował."
+msgstr "Lista błędów (rozdzielona spacjami) zawierająca wykaz błędów ssl, które program będzie ignorował."
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
@@ -4138,259 +3748,250 @@ msgid "XMPP ping sent after inactivity"
 msgstr "Wysyłanie pingu XMPP po nieaktywności"
 
 #: ../src/common/config.py:323
-msgid ""
-"How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
-msgstr ""
-"Czas oczekiwania (w sekundach) na odpowiedź na pakiet podtrzymujący "
-"połączenie przed podjęciem próby ponownego połączenia."
+msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
+msgstr "Czas oczekiwania (w sekundach) na odpowiedź na pakiet podtrzymujący połączenie przed podjęciem próby ponownego połączenia."
 
 #. yes, no, ask
 #: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: ../src/common/config.py:331
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"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:330
+msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
+msgstr "Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza file_transfers_proxies i użyje ich podczas przesyłania plików."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Odpowiedź na żądanie potwierdzenia"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Wyślij żądanie potwierdzenia"
 
-#: ../src/common/config.py:354
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją "
-"logować?"
+#: ../src/common/config.py:353
+msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
+msgstr "Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją logować?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: ../src/common/config.py:418
-msgid ""
-"Should Gajim automatically start an encrypted session with this contact when "
-"possible?"
-msgstr ""
-"Czy Gajim powinien automatycznie rozpoczynać zaszyfrowana sesję z tym "
-"kontaktem, jeśli to możliwe?"
+#: ../src/common/config.py:417
+msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
+msgstr "Czy Gajim powinien automatycznie rozpoczynać zaszyfrowana sesję z tym kontaktem, jeśli to możliwe?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418
+#: ../src/common/config.py:421
 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:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "all lub komunikaty stanu rozdzielone spacjami"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' lub 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429
+#: ../src/common/config.py:431
+#: ../src/common/config.py:432
+#: ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' lub \""
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442
+#: ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444
+#: ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446
+#: ../src/common/pep.py:186
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461
+#: ../src/config.py:1478
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464
+#: ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: ../src/common/config.py:476
-msgid ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
-msgstr ""
-"Dźwięk, który zostanie odtworzony, gdy wiadomość MUC będzie zawierać jeden z "
-"wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
-"będzie twój pseudonim."
+#: ../src/common/config.py:475
+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 "Dźwięk, który zostanie odtworzony, gdy wiadomość MUC będzie zawierać jeden z wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać będzie twój pseudonim."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 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:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485
+#: ../src/common/optparser.py:302
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489
+#: ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nie można załadować modułu idle"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Błędna nazwa hosta"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Niepoprawny adres lokalny? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, 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:703
 msgid "Registration succeeded"
 msgstr "Rejestracja zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Rejestracja z %s zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
 msgstr "Rejestracja nie powiodła się"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-"Rejestracja z %(agent)s nie powiodła się, błąd %(error)s: %(error_msg)s"
-
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+msgid "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr "Rejestracja z %(agent)s nie powiodła się, błąd %(error)s: %(error_msg)s"
+
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481
+#: ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Błąd zapisu na dysk"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225
+#: ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Niewidoczność nie jest obsługiwana"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226
+#: ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s nie obsługuje niewidoczności."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919
+#: ../src/common/connection.py:233
+#: ../src/config.py:1940
+#: ../src/config.py:1949
+#: ../src/config.py:2008
+#: ../src/config.py:3360
+#: ../src/dataforms_widget.py:577
+#: ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Doszła wiadomość od nieprawidłowego JID, będzie zignorowana"
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484
+#: ../src/common/connection.py:421
+#: ../src/gajim.py:155
+#: ../src/session.py:135
 #, 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 ""
-"Plik bazy danych (%s) nie mógł zostać odczytany. Spróbuj to naprawić (zobacz "
-"http://trac.gajim.org/wiki/DatabaseBackup) lub usuń ten plik(całe archiwum "
-"rozmów zostanie usunięte)."
+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 "Plik bazy danych (%s) nie mógł zostać odczytany. Spróbuj to naprawić (zobacz http://trac.gajim.org/wiki/DatabaseBackup) lub usuń ten plik(całe archiwum rozmów zostanie usunięte)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Pseudonim jest niedozwolony: %s"
@@ -4398,84 +3999,80 @@ msgstr "Pseudonim jest niedozwolony: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310
+#: ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Osiągnięto maksymalną liczbę użytkowników dla %s"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zostałeś zabanowany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Pokój %s nie istnieje."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, 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:2320
+#: ../src/common/connection_handlers.py:2311
 #, 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:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Pokój został usunięty"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, 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:2402
+#: ../src/common/connection_handlers.py:2393
 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:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, 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 nie jest kompatybilny z RFC. Nie zostanie dodany do listy kontaktów. "
-"Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
-"jabberstudio.org/ aby go usunąć"
+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 nie jest kompatybilny z RFC. Nie zostanie dodany do listy kontaktów. Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru.jabberstudio.org/ aby go usunąć"
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4605,81 +4202,110 @@ msgstr "Tym kluczem nie można podpisywać certyfikatu"
 msgid "Application verification failure"
 msgstr "Błąd weryfikacji aplikacji"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234
+#: ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Niemożna wysłać wiadomości do %s, JID jest nieprawidłowy."
+
+#: ../src/common/connection.py:256
+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:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "Klucz kontaktu (%s) nie pasuje do klucza przypisanego w Gajimie."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Temat: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Połącz ponownie ręcznie."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr ""
-"Serwer %(name)s udzielił nieprawidłowej odpowiedzi na żądanie rejestracji: %"
-"(error)s"
+msgstr "Serwer %(name)s udzielił nieprawidłowej odpowiedzi na żądanie rejestracji: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serwer %s przesłał niezgodny formularz rejestracyjny"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nieznany błąd SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Niepoprawna odpowiedź"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr ""
-"Transport %(name)s udzielił nieprawidłowej odpowiedzi na żądanie "
-"rejestracji: %(error)s"
+msgstr "Transport %(name)s udzielił nieprawidłowej odpowiedzi na żądanie rejestracji: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075
+#: ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076
+#: ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serwer odpowiedział: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Połączenie z serwerem proxy nie powiodło się"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125
+#: ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie można połączyć się %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126
+#: ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Połączenie z kontem %s zostało zerwane."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Nie można potwierdzić autentyczności certyfikatu %s."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4688,7 +4314,7 @@ msgstr ""
 "\n"
 "Błąd SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4697,105 +4323,73 @@ msgstr ""
 "\n"
 "Nieznany błąd SSL: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Błąd usuwaniu listy prywatności"
 
-#: ../src/common/connection.py:863
-#, python-format
-msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
-msgstr ""
-"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:1182 ../src/dialogs.py:2666
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Niemożna wysłać wiadomości do %s, JID jest nieprawidłowy."
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-"Komunikat o statusie obecności nie jest podpisany, nie przypisano mu też "
-"klucza."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Klucz kontaktu (%s) nie pasuje do klucza przypisanego w Gajimie."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
+#: ../src/common/connection.py:1301
 #, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Temat: %(subject)s\n"
-"%(message)s"
+msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Deactivate it and try again."
+msgstr "Lista prywatności %s nie została usunięta. Prawdopodobnie jest aktywna w jednym z połączonych zasobów. Wyłącz ją i spróbuj ponownie."
 
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Wysłany kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Zaproś kontakty"
+msgstr "Wyślij kontakty:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Rejestracja nie powiodła się"
+msgstr "Błąd przy usuwaniu konta"
 
-#: ../src/common/connection.py:1983
-#, fuzzy, python-format
+#: ../src/common/connection.py:2107
+#, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
-"Rejestracja z %(agent)s nie powiodła się, błąd %(error)s: %(error_msg)s"
+msgstr "Wypisanie się z serwera %(server)s nie powiodło się: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129
+#: ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Obserwatorzy"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/common/contacts.py:133
+#: ../src/common/contacts.py:335
+#: ../src/common/helpers.py:55
+#: ../src/disco.py:119
+#: ../src/disco.py:120
+#: ../src/disco.py:1464
+#: ../src/gui_interface.py:413
+#: ../src/roster_window.py:848
+#: ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572
+#: ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Spoza listy kontaktów"
 
@@ -4804,20 +4398,19 @@ msgstr "Spoza listy kontaktów"
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na tym komputerze brakuje pythonowych dowiązań do D-Bus."
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:41
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Nie można użyć D-Bus."
 
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus nie działa prawidłowo na tym komputerze"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"Nie znaleziono biblioteki pysqlite2 (lub python-pysqlite2). Kończenie pracy "
-"programu..."
+msgstr "Nie znaleziono biblioteki pysqlite2 (lub python-pysqlite2). Kończenie pracy programu..."
 
 #: ../src/common/exceptions.py:47
 msgid "Database cannot be read."
@@ -4825,9 +4418,7 @@ msgstr "Baza danych nie może zostać odczytana."
 
 #: ../src/common/exceptions.py:55
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Usługa nie jest dostępna. Gajim nie działa lub remote_control ma wartość "
-"False"
+msgstr "Usługa nie jest dostępna. Gajim nie działa lub remote_control ma wartość False"
 
 #: ../src/common/exceptions.py:63
 msgid "D-Bus is not present on this machine or python module is missing"
@@ -4921,10 +4512,13 @@ msgstr "dwadzieścia po %(0)s"
 msgid "twenty five past %(0)s"
 msgstr "za pięć wpół do %(0)s"
 
+# should be:
+# wpół do %(1)s
+# because in Polish it means "thirty to (hour)" and NOT "thirty after (hour)" poedit does not accept this :\
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "half past %(0)s"
-msgstr "w pół do %(1)s"
+msgstr "wpół do %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
 #, python-format
@@ -4956,7 +4550,8 @@ msgstr "za pięć %(1)s"
 msgid "%(1)s o'clock"
 msgstr "godzina %(1)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noc"
 
@@ -4992,7 +4587,8 @@ msgstr "Późny wieczór"
 msgid "Start of week"
 msgstr "Początek tygodnia"
 
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
+#: ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Środek tygodnia"
 
@@ -5044,7 +4640,8 @@ msgstr "Chętny do rozmowy"
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212
+#: ../src/features_window.py:118
 msgid "Available"
 msgstr "Dostępny"
 
@@ -5162,48 +4759,49 @@ msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049
+#: ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5211,22 +4809,24 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " z pokoju %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065
+#: ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " od użytkownika %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074
+#: ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5234,7 +4834,7 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5250,16 +4850,17 @@ msgid "%s is not a valid loglevel"
 msgstr "%s nie jest prawidłowym poziomem logowania"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297
+#: ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -5268,633 +4869,655 @@ msgstr "indeksowanie archiwum rozmów"
 msgid "XMPP account %s@%s"
 msgstr "Konto XMPP %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
-msgstr "Obawiam się"
+msgstr "Przestraszony"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Zadziwiony"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
-msgstr "Zakochany"
+msgstr "Kochliwy"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Zły"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
-msgstr "Zdenerwowany"
+msgstr "Zirytowany"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
-msgstr "Niecierpliwy"
+msgstr "Niespokojny"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Podniecony"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Zawstydzony"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Znudzony"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Odważny"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Spokojny"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Ostrożny"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
-msgstr "W złym humorze."
+msgstr "Zziębnięty"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Pewny siebie"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Zmieszany"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Zamyślony"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Zadowolony"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
-msgstr "Zły"
+msgstr "Nawiedzony"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Szalony"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Twórczy"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Ciekawy"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
-msgstr "Smutny"
+msgstr "Ponury"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
-msgstr "Przygnębiony"
+msgstr "Zdołowany"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
-msgstr "rozczarowany"
+msgstr "Rozczarowany"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
-msgstr "zniesmaczony"
+msgstr "Zniesmaczony"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
-msgstr "Przygnębiony"
+msgstr "Zaniepokojony"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Roztargniony"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
-msgstr "Zażenowany"
+msgstr "Zawstydzony"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
-msgstr "Zazdrosny"
+msgstr "Zawistny"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
-msgstr "Podniecony"
+msgstr "Podekscytowany"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
-msgstr "Gotowy do flirtu"
+msgstr "Flirciarski"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Sfrustrowany"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Wdzięczny"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
-msgstr "Zrozpraczony"
+msgstr "Zasmucony"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
-msgstr "Zrzędliwy"
+msgstr "Marudny"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Winny"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
-msgstr "Szczęśliwy"
+msgstr "Wesoły"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Pełen nadziei"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Gorący"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Upokorzony"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Poniżony"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Głodny"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
-msgstr "zraniony"
+msgstr "Zraniony"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "pod wrażeniem"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
-msgstr "Wstrząśnięty"
+msgstr "Bojaźliwy"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Zakochany"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Oburzony"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "zainteresowany"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
-msgstr "Pijany"
+msgstr "Odurzony"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Niepokonany"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Zazdrosny"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Samotny"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Zagubiony"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Szczęśliwy"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
-msgstr "Skromny"
+msgstr "Okrutny"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
-msgstr "Nastrojowy"
+msgstr "Markotny"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nerwowy"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
-msgstr "Zraniony"
+msgstr "Obrażony"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
-msgstr "Oburzony"
+msgstr "Znieważony"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
-msgstr "Wesoły"
+msgstr "Filuterny"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Dumny"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Odprężony"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Podniesiony na duchu"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Skruszony"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Niespokojny"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Smutny"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarkastyczny"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Zadowolony"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Poważny"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
-msgstr "Zszokowany"
+msgstr "Wstrząśnięty"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Nieśmiały"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Chory"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
-msgstr "Śpiący"
+msgstr "Senny"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
-msgstr "Spontaniczny"
+msgstr "Żywiołowy"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Zestresowany"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Silny"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Zaskoczony"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Wdzięczny"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Spragniony"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Zmęczony"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Słaby"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Zmartwiony"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Krzątam się"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Na zakupach"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
-msgstr "Czyszczę"
+msgstr "Sprzątam"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Gotuję"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Naprawiam"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
-msgstr "Zmywam_Naczynia"
+msgstr "Zmywam naczynia"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Piorę"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Pracuję w ogrodzie"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Biegam na posyłki"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
-msgstr "Wyprowadzam Psa"
+msgstr "Wyprowadzam psa"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Piję"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
-msgstr "Hiję_Piwo"
+msgstr "Piję piwo"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
-msgstr "Piję_Kawę"
+msgstr "Piję kawę"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
-msgstr "Piję_Herbatę"
+msgstr "Piję herbatę"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
-msgstr "Coś_Przegryzam"
+msgstr "Coś  przegryzam"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
-msgstr "Jem_Śniadanie"
+msgstr "Jem śniadanie"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
-msgstr "Jem_Obiad"
+msgstr "Jem obiad"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
-msgstr "Jem_Lunch"
+msgstr "Jem lunch"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Ćwiczę"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133
+#: ../src/common/pep.py:178
 msgid "Cycling"
-msgstr "Jeżdżę_Na_Rowerze"
+msgstr "Jeżdżę na rowerze"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Tańczę"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
-msgstr "Wspinam Się"
+msgstr "Wspinam się"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Jogging"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
-msgstr "Uprawiam Sport"
+msgstr "Uprawiam sport"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Biegam"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Na nartach"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Pływam"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
-msgstr "Ćwiczę"
+msgstr "Wyciskam"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
-msgstr "Obrażony"
+msgstr "Dbam o urodę"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
-msgstr "W_Salonie_Spa"
+msgstr "W salonie Spa"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
-msgstr "Myję_Zęby"
+msgstr "Myję zęby"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
-msgstr "U_Fryzjera"
+msgstr "U fryzjera"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Golę się"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
-msgstr "Biorę Kąpiel"
+msgstr "Biorę kąpiel"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
-msgstr "Biorę Prysznic"
+msgstr "Biorę prysznic"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
-msgstr "Na_Spotkaniu"
+msgstr "Na spotkaniu"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
-msgstr "Dzień_Wolny"
+msgstr "Dzień wolny"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Wałęsam się"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Ukrywam się"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
-msgstr "Na Wakacjach"
+msgstr "Na wakacjach"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Modlę się"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
-msgstr "Wakacje Zaplanowane"
+msgstr "Zaplanowane wakacje"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Myślę"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Odpoczywam"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Łowię ryby"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Gram"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
-msgstr "wychodzę"
+msgstr "Wychodzę"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
-msgstr "Bawię się"
+msgstr "Imprezuję"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Czytam"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Na próbie"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Na zakupach"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
-msgstr "Pale"
+msgstr "Palę"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Udzielam się towarzysko"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Opalam się"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Oglądam TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
-msgstr "Oglądam film."
+msgstr "Oglądam film"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Rozmawiam"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
-msgstr "W realu(prawdziwym życiu)"
+msgstr "W rzeczywistości"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
-msgstr "rozmawiam przez telefon"
+msgstr "Rozmawiam przez telefon"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
-msgstr "Wideorozmowa"
+msgstr "Wideokonferencja"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "W podróży"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "W drodze do pracy"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
-msgstr "jeżdzę"
+msgstr "Prowadzę samochód"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "W samochodzie"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "W autobusie"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "W samolocie"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "W pociągu"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "Na wyciecze"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
-msgstr "Spaceruje"
+msgstr "Spaceruję"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
-msgstr "koduję"
+msgstr "Programuję"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "Na spotkaniu"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Uczę się"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
-msgstr "piszę"
+msgstr "Piszę"
+
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Nieznany wykonawca"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Nieznany tytuł"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Nieznany album"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> w wykonaniu <i>%(artist)s</i>\n"
+"z <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
@@ -5903,52 +5526,19 @@ msgid "Unable to bind to port %s."
 msgstr "Nie można podłączyć się do portu %s."
 
 #: ../src/common/socks5.py:87
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Być może masz już uruchomioną inną kopię Gajima. Przesyłanie plików zostanie "
-"anulowane."
+msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
+msgstr "Być może masz już uruchomioną inną kopię Gajima. Przesyłanie plików zostanie anulowane."
 
 #. we're not english
 #: ../src/common/stanza_session.py:301
-msgid ""
-"[This is part of an encrypted session. If you see this message, something "
-"went wrong.]"
-msgstr ""
-"[To jest część zaszyfrowanej wiadomości. Jeżeli widzisz tą wiadomość, "
-"oznacza to, że coś poszło źle.]"
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Nazwa hosta %s, którą określiłeś w opcji ft_add_hosts_to_send jest "
-"niepoprawna, będzie więc ignorowana."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Nie podano klucza OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
+msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
+msgstr "[To jest część zaszyfrowanej wiadomości. Jeżeli widzisz tą wiadomość, oznacza to, że coś poszło źle.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Aby dalej wysyłać i odbierać wiadomości musisz się ponownie połączyć."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Błąd Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5957,57 +5547,46 @@ msgstr ""
 "%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:190
 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:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 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:200
 #, 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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 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:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, 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
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Nie jesteś połączony, lub masz status 'niewidoczny'. Twoja wiadomość nie "
-"mogła zostać wysłana."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Ta wiadomość jest zaszyfrowana]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 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:334
 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:593
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Nie można ustanowić połączenia z hostem. Timeout podczas wysyłania danych."
+#: ../src/common/zeroconf/connection_zeroconf.py:359
+msgid "Connection to host could not be established: Timeout while sending data."
+msgstr "Nie można ustanowić połączenia z hostem. Timeout podczas wysyłania danych."
 
 #: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
@@ -6015,244 +5594,250 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157
+#: ../src/config.py:586
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Domyśla wiadomość"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654
+#: ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
-msgid ""
-"You have to install %s dictionary to use spellchecking, or choose another "
-"language by setting the speller_language option."
-msgstr ""
-"Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
-"inny język korzystać z opcji speller_langugage."
+msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
+msgstr "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394
+#: ../src/dialogs.py:2232
+#: ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014
+#: ../src/disco.py:831
+#: ../src/disco.py:1690
+#: ../src/disco.py:1992
+#: ../src/history_window.py:89
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 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."
+msgstr "Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz zalogować się ponownie."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620
+#: ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785
+#: ../src/config.py:1829
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
-msgstr ""
-"Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
+msgstr "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 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ć?"
+msgstr "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825
+#: ../src/config.py:2348
+#: ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
-msgstr ""
-"Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
+msgstr "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1772
-msgid ""
-"This name is already used by another of your accounts. Please choose another "
-"name."
+#: ../src/config.py:1837
+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:1776 ../src/config.py:1780
+#: ../src/config.py:1841
+#: ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Zmień nazwę konta"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Wpisz nową nazwę dla kontaktu %s."
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158
+#: ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159
+#: ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr ""
-"Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
+msgstr "Brak tajnego klucza OpenPGP."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 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:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231
+#: ../src/dialogs.py:2031
+#: ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405
+#: ../src/disco.py:477
+#: ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 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:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349
+#: ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
+msgstr "Aby wyłączyć konto, musisz się rozłączyć."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr ""
-"Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
+msgstr "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600
+#: ../src/disco.py:838
+#: ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6260,11 +5845,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6272,11 +5857,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6284,11 +5869,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6296,7 +5881,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6312,123 +5897,123 @@ msgstr ""
 "4. domena (dotyczy domeny a także dowolnego adresu typu użytkownik@domena,\n"
 "domena/zasób lub adresu zawierającego subdomenę)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785
+#: ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786
+#: ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787
+#: ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2923
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:3001
+msgid "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119
+#: ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120
+#: ../src/config.py:3134
+#: ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Pseudonim jest niedozwolony: %s"
+msgstr "Niedozwolony znak"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133
+#: ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Niepoprawny wpis"
+msgstr "Niepoprawny pokój"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
-msgid ""
-"You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menu item under the Edit menu from the main "
-"window."
-msgstr ""
-"Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub "
-"później wybierając pozycję Konta z menu Edycja w głównym oknie programu."
+#: ../src/config.py:3300
+#: ../src/config.py:3306
+msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menu item under the Edit menu from the main window."
+msgstr "Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub później wybierając pozycję Konta z menu Edycja w głównym oknie programu."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439
+#: ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440
+#: ../src/gui_interface.py:1858
 #, 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."
+msgstr "Ten certyfikat znajduje się już w pliku %s, więc nie zostanie ponownie dodany."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6443,7 +6028,8 @@ msgstr ""
 "Błąd SSL: %(error)s\n"
 "Czy nadal chcesz się połączyć z tym serwerem?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516
+#: ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6454,63 +6040,64 @@ msgstr ""
 "Odcisk klucza SHA1 certyfikatu:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543
+#: ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Otrzymałeś następną wiadomość"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Otrzymałeś następną wiadomość w tle"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6520,7 +6107,7 @@ msgstr ""
 "odebrana. Jeśli ta ikona zostanie przez długi czas,\n"
 "może oznaczać, że wiadomości została zgubiona."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6528,329 +6115,330 @@ msgstr ""
 "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju\n"
 "od momentu gdy ostatni raz odwiedziłeś/odwiedziłaś ten pokój"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Zakończ"
+msgstr "_Cytuj"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "W URL-u słownika brakuje \"%s\" i nie jest to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
-#: ../src/conversation_textview.py:1274
-msgid "Yesterday"
-msgstr "Wczoraj"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
 #, python-format
-msgid "%i days ago"
-msgstr "%i dni temu"
+msgid "Yesterday"
+msgid_plural "%i days ago"
+msgstr[0] "Wczoraj"
+msgstr[1] "%i dni temu"
+msgstr[2] "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330
+#: ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
-msgstr "Te JID jest już na liście"
+msgstr "Ten JID jest już na liście"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 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:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "nowy@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596
+#: ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nowy%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazwa kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "W grupie"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "Identyfikator klucza"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
-msgstr "Ustaw Nastrój"
+msgstr "Ustaw nastrój"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Zmienić opis statusu?"
 
-#: ../src/dialogs.py:773
-msgid ""
-"This name is already used. Do you want to overwrite this status message?"
+#: ../src/dialogs.py:794
+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:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "_Adres AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "_Adres MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Adres _Yahoo:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, 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:849
+#: ../src/dialogs.py:874
 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:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1041
+#: ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Ty nie możesz dodać siebie do swojej listy kontaktów."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "I wreszcie, chcielibyśmy podziękować wszystkim opiekunom pakietów."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Tłumaczenie na język polski: Witold Kieraś\n"
 "Maciej Chojnacki <maciej@chojnacki.name>Sławomir Domagała <godlark@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, 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 ""
-"Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
-"inny język korzystać z opcji speller_langugage.\n"
+"Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać 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:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830
+#: ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, 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:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026
+#: ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 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:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Niepoprawna nazwa konta"
+msgstr "Niepoprawne konto"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
-msgid ""
-"You have to choose an account from which you want to join the groupchat."
+#: ../src/dialogs.py:2161
+msgid "You have to choose an account from which you want to join the groupchat."
 msgstr "Wskaż konto, z którym chcesz wejść do pokoju"
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175
+#: ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Proszę wprowadzić JID konferencji w postaci pokój@serwer."
+
+#: ../src/dialogs.py:2182
+#: ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwą czatu."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 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."
+msgstr "Nie możesz synchronizować kontaktów z kontem, które nie jest połączone."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6859,300 +6447,352 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384
+#: ../src/dialogs.py:2767
+#: ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385
+#: ../src/dialogs.py:2768
+#: ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394
+#: ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 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:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 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:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469
+#: ../src/notify.py:263
+#: ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471
+#: ../src/notify.py:271
+#: ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473
+#: ../src/notify.py:294
+#: ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473
+#: ../src/notify.py:275
+#: ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474
+#: ../src/notify.py:282
+#: ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474
+#: ../src/gui_interface.py:1315
+#: ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476
+#: ../src/gui_interface.py:1382
+#: ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478
+#: ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349
+#: ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480
+#: ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449
+#: ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481
+#: ../src/gui_interface.py:1430
+#: ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483
+#: ../src/gui_interface.py:1123
+#: ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485
+#: ../src/notify.py:255
+#: ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, 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:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
-#, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Chciałbym dodać Cię do listy kontaktów."
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+msgid "add"
+msgstr "dodaj"
+
+#: ../src/dialogs.py:2958
+msgid "modify"
+msgstr "modyfikuj"
+
+#: ../src/dialogs.py:2959
+msgid "remove"
+msgstr "usuń"
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#: ../src/dialogs.py:2987
+#, python-format
+msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
+msgstr "<b>%(jid)s</b> chciałby <b>%(action)s</b> kilka kontaktów w Twoim rosterze."
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003
+#: ../src/dialogs.py:3049
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005
+#: ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "_Edytuj"
+msgstr "Edytuj"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Jabber ID:"
+msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Grupa"
+msgstr "Grupy"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Chciałbym dodać Cię do listy kontaktów."
+msgstr "%s zasugerował(a), żebym dodał Cię do rostera."
+
+#: ../src/dialogs.py:3139
+#, python-format
+msgid "Added  %s contacts"
+msgstr "Dodano %s kontaktów"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3176
+#, python-format
+msgid "Removed  %s contacts"
+msgstr "Usunięto %s kontaktów"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, 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"
+msgstr "Kolejność: %(order)s, akcja: %(action)s, typ: %(type)s, wartość: %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Kolejność: %(order)s, akcja: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasza cię do rozmowy"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, 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:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740
+#: ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "Nr"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "kiedy mam "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7163,86 +6803,84 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Już zweryfikowałeś tożsamość tego kontaktu."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551
+#: ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Tożsamość rozmówcy zweryfikowana"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Ponowna weryfikacja..."
 
-#: ../src/dialogs.py:4423
-msgid ""
-"To be certain that <b>only</b> the expected person can read your messages or "
-"send you messages, you need to verify their identity by clicking the button "
-"below."
-msgstr ""
-"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:4564
+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:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567
+#: ../src/dialogs.py:4621
+#: ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Tożsamość rozmówcy NIE zweryfikowana"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Weryfikowanie..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Czy zweryfikowałeś/zweryfikowałaś tożsamość zdalnego rozmówcy?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, 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 ""
-"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"
+"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:4447
+#: ../src/dialogs.py:4588
 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:4479
+#: ../src/dialogs.py:4622
 #, 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."
+msgstr "Klucz kontaktu (%s) <b>nie pasuje</b> do klucza przypisanego w Gajimie."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 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."
+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:4492
-msgid ""
-"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
-"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
-msgstr ""
-"Klucz GPG jest przypisany do tego kontaktu, lecz <b>ty nie importowałeś tego "
-"klucza</b>, więc wiadomość <b>nie będzie</b> odszyfrowana. Użyj twojego "
-"klienta GPG, aby importować klucz."
+#: ../src/dialogs.py:4635
+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 "Klucz GPG jest przypisany do tego kontaktu, lecz <b>ty nie importowałeś tego klucza</b>, więc wiadomość <b>nie będzie</b> odszyfrowana. Użyj twojego klienta GPG, aby importować klucz."
 
-#: ../src/dialogs.py:4498
-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/dialogs.py:4641
+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/dialogs.py:4708
+msgid "an audio and video"
+msgstr "wideo-głosową"
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr "głosową"
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr "wideo"
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
+msgstr "%(contact)s chce rozpocząć z Tobą rozmowę %(type)s. Chcesz odebrać?"
 
 #: ../src/disco.py:118
 msgid "Others"
@@ -7253,368 +6891,348 @@ msgstr "Inni"
 msgid "Conference"
 msgstr "Konferencja"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Nie możesz przeglądać usług, jeśli nie jesteś połączony"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: ../src/disco.py:660
-msgid ""
-"There is no service at the address you entered, or it is not responding. "
-"Check the address and try again."
-msgstr ""
-"Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
-"adres i spróbuj ponownie."
+#: ../src/disco.py:707
+msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
+msgstr "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź adres i spróbuj ponownie."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711
+#: ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Tego typu usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751
+#: ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Przeglądanie %(address)s przy użyciu konta %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "Prze_glądaj"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Wykonaj komendę"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298
+#: ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanowanie %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781
+#: ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782
+#: ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791
+#: ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792
+#: ../src/gui_interface.py:3103
 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."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Zasubskrybowano"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Węzeł"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Nowy wpis"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzację"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr "Sprawdzanie certyfikatu SSL"
 
-#: ../src/features_window.py:47
-msgid ""
-"A library used to validate server certificates to ensure a secure connection."
-msgstr ""
-"Biblioteka używana do weryfikacji certyfikatów w celu zapewnienia "
-"bezpiecznego połączenia."
+#: ../src/features_window.py:49
+msgid "A library used to validate server certificates to ensure a secure connection."
+msgstr "Biblioteka używana do weryfikacji certyfikatów w celu zapewnienia bezpiecznego połączenia."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Wymaga python-pyopenssl"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr ""
-"Rozmowy w sieci lokalnej, bez pośrednictwa serwera i z automatycznym "
-"wykrywaniem klientów."
+msgstr "Rozmowy w sieci lokalnej, bez pośrednictwa serwera i z automatycznym wykrywaniem klientów."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Wymaga python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Wymaga pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 msgid "Command line"
 msgstr "Linia poleceń"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Skrypt pozwalający na sterowanie Gajimem z linii poleceń."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Wymaga python-dbus"
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59
+#: ../src/features_window.py:63
+#: ../src/features_window.py:67
+#: ../src/features_window.py:71
+#: ../src/features_window.py:75
+#: ../src/features_window.py:83
+#: ../src/features_window.py:87
+#: ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Funkcjonalność niedostępna dla systemu Windows."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
 msgstr "Szyfrowanie OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Szyfrowanie wiadomości kluczami GPG."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Wymaga GPG oraz python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 msgid "Network-manager"
 msgstr "Menedżer sieci"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Automatyczne wykrywanie stanu sieci."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Wymaga gnome-network-manager oraz python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Zarządzanie sesją"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
-msgstr ""
-"Sesja jest zapisywana przy wylogowaniu z serwera i przywracana przy "
-"logowaniu."
+msgstr "Sesja jest zapisywana przy wylogowaniu z serwera i przywracana przy logowaniu."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Wymaga python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 msgid "Password encryption"
 msgstr "Hasło"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Bezpieczne przechowywanie haseł."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Wymaga gnome-keyring oraz python-gnome-desktop."
+msgstr "Wymaga gnome-keyring oraz python-gnome2-desktop albo kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Możliwość połączenia z serwerami, które używają rekordów SRV."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Wymaga dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Wymaga nslookup."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Słownik"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Zwraca uwagę na błędy w wysyłanych wiadomościach."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr "Wymaga libgtkspell"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 msgid "Notification"
 msgstr "Powiadomienia"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Wyświetla okna informujące o nowych zdarzeniach."
 
-#: ../src/features_window.py:84
-msgid ""
-"Requires python-notify or instead python-dbus in conjunction with "
-"notification-daemon."
-msgstr ""
-"Wymaga python-notify lub python-dbus w połączeniu z notification-daemon."
-
 #: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Ikona w obszarze powiadamiania"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Ikona w obszarze powiadamiania odzwierciedla aktualny status."
+msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
+msgstr "Wymaga python-notify lub python-dbus w połączeniu z notification-daemon."
 
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Wymaga python-gnome2-extras lub skompilowanego modułu trayicon ze źródeł "
-"Gajima."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Wymaga PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatyczny status"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-"Umożliwia mierzenie czasu bezczynności i odpowiednie ustawienie statusu."
+msgstr "Umożliwia mierzenie czasu bezczynności i odpowiednie ustawienie statusu."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr "Wymaga biblioteki libxss."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr "Wymaga python2.5"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Przekształcanie wyrażeń jezyka LaTeX pomiędzy $$ $$."
 
-#: ../src/features_window.py:96
-msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
-msgstr ""
-"Wymaga texlive-latex-base, dvipng. Musisz ustawić zmienną 'use_latex' na "
-"'True'  w Zaawansowanym Edytorze Ustawień."
+#: ../src/features_window.py:94
+msgid "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True in the Advanced Configuration Editor."
+msgstr "Wymaga texlive-latex-base, dvipng. Musisz ustawić zmienną 'use_latex' na 'True'  w Zaawansowanym Edytorze Ustawień."
 
-#: ../src/features_window.py:97
-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-base, dvipng (Wszystko jest w MikTeX). Musisz ustawić "
-"zmienną 'use_latex' na 'True' w Zaawansowanym Edytorze Ustawień."
+#: ../src/features_window.py:95
+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-base, dvipng (Wszystko jest w MikTeX). Musisz ustawić zmienną 'use_latex' na 'True' w Zaawansowanym Edytorze Ustawień."
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
 msgstr "Szyfrowanie typu \"end to end\""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Szyfrowanie wysyłanych wiadomości."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Wymaga python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "Generator RST"
 
-#: ../src/features_window.py:103
-msgid ""
-"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
-"docs/ref/rst/restructuredtext.html)."
-msgstr ""
-"Tworzy XHTML z kodu RST (patrz http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html)."
+#: ../src/features_window.py:101
+msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+msgstr "Tworzy XHTML z kodu RST (patrz http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102
+#: ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Wymaga python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr "Banery i klikalne linki"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Dodaje możliwość wyświetlania aktywnych ('klikalnych') adresów URL."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Wymaga python-sexy"
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr "Można rozpocząć rozmowę głosową i wideo."
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr "Wymaga python-farsight."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Możliwości"
 
@@ -7630,140 +7248,149 @@ msgstr "Czas"
 msgid "Progress"
 msgstr "Postęp"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177
+#: ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178
+#: ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %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:520
+#: ../src/filetransfers_window.py:187
+#: ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisane w: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Przesyłanie pliku anulowane"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Nie można ustanowić połączenia z drugą stroną."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Odbiorca: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Komunikat błędu: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Wybierz plik do wysłania..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273
+#: ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim nie może uzyskać dostępu do tego pliku"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Ten plik jest używany przez inny proces."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342
+#: ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
-msgid ""
-"A file with this name already exists and you do not have permission to "
-"overwrite it."
-msgstr ""
-"Istnieje już plik o tej nazwie a Ty nie masz uprawnień do jego nadpisania."
+#: ../src/filetransfers_window.py:343
+#: ../src/gtkgui_helpers.py:860
+msgid "A file with this name already exists and you do not have permission to overwrite it."
+msgstr "Istnieje już plik o tej nazwie a Ty nie masz uprawnień do jego nadpisania."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359
+#: ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359
+#: ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369
+#: ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Nie masz uprawnień do zapisu w folderze \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369
+#: ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Zapisz obraz jako..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7771,32 +7398,35 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Plik: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613
+#: ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615
+#: ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Zatrzymaj"
 
@@ -7815,9 +7445,7 @@ msgstr "Gajim wymaga PyGTK w wersji 2.12 lub wyższej"
 
 #: ../src/gajim.py:181
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr ""
-"Gajim wymaga do działania PyGTK w wersji 2.12 lub wyższej. Zamykanie "
-"programu..."
+msgstr "Gajim wymaga do działania PyGTK w wersji 2.12 lub wyższej. Zamykanie programu..."
 
 #: ../src/gajim.py:183
 msgid "Gajim needs GTK 2.12 or above"
@@ -7825,9 +7453,7 @@ msgstr "Gajim wymaga GTK w wersji 2.12 lub wyższej"
 
 #: ../src/gajim.py:184
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr ""
-"Gajim wymaga do działania GTK w wersji 2.12 lub wyższej. Zamykanie "
-"programu..."
+msgstr "Gajim wymaga do działania GTK w wersji 2.12 lub wyższej. Zamykanie programu..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7835,18 +7461,12 @@ msgstr "W GTK+ brakuje wsparcia dla libglade"
 
 #: ../src/gajim.py:191
 #, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
+msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
+msgstr "Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
 
 #: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla "
-"libglade."
+msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr "Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla libglade."
 
 #: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
@@ -7858,19 +7478,15 @@ msgstr "Gajim wymaga do działania pakietu pywin32"
 
 #: ../src/gajim.py:207
 #, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Proszę upewnić się, że zainstalowany jest pakiet Pywin32. Możesz go pobrać "
-"spod adresu %s"
+msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
+msgstr "Proszę upewnić się, że zainstalowany jest pakiet Pywin32. Możesz go pobrać spod adresu %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim jest już uruchomiony"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7878,806 +7494,351 @@ msgstr ""
 "Wydaje się, że w tle działa już inna kopia Gajima.\n"
 "Czy mimo to chcesz uruchomić program?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Wymagane hasło"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr "Klucz GPG stracił ważność"
-
-#: ../src/gajim.py:456
-#, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Twój klucz GPG stracił ważność, zostaniesz połączony z %s bez OpenGPG"
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Błędne hasło"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr ""
-"Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Pożądany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś "
-"innego w pokoju %s.\n"
-"Podaj inny pseudonim:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Czy akceptujesz tę prośbę?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Czy akceptujesz tę prośbę na koncie %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Autoryzacja HTTP (%(method)s) dla %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Połączenie nie powiodło się"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Błąd %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-msgid "Subscription request"
-msgstr "Prośba o autoryzację"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autoryzacja przyjęta"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Zawsze będziesz widział ten kontakt jako rozłączony.\n"
-"Czy chcesz go usunąć z listy kontaktów?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-msgid "Unsubscribed"
-msgstr "Cofnij autoryzację"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Nie można ustanowić połączenia z \"%s\""
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s występuje teraz jako %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s ma teraz status %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s ustawił temat na %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Lista zawiera teraz niedostępnych uczestników"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "lista nie zawiera teraz niedostępnych użytkowników"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Nastąpiła zmiana konfiguracji pokoju (nie powiązana z prywatnością)"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Pokój nie jest już anonimowy"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Pokój jest teraz quasi-anonimowy"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Pokój jest teraz w pełni anonimowy"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Aby dołączyć do pokoju %s wymagane jest hasło. Proszę je wpisać"
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Skonfigurowałeś Gajima by używał agenta GPG, ale agent nie jest uruchomiony "
-"lub zwraca błędne hasło.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Twoje hasło jest niepoprawne"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Twoje hasło jest niepoprawne"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr "GPG nie jest zaufany"
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Klucz GPG używany do szyfrowania tej rozmowy nie jest zaufany. Czyn naprawdę "
-"chcesz zaszyfrować tą wiadomość?"
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Nie pytaj mnie o to ponownie"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Menedżer bazy kluczy GNOME jest zainstalowany, ale nie został \t\t\t"
-"\tprawidłowo uruchomiony(zmienna środowiskowa prawdopodobnie nie jest \t\t\t"
-"\t właściwie ustawiona)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Masz %d nieprzeczytaną wiadomość pocztową"
-msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
-msgstr[2] "Masz %d nieprzeczytane wiadomości pocztowe"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Od: %(from_address)s\n"
-"Temat: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s chce przesłać ci plik."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Usuwa kontakt z listy kontaktów"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Błąd odczytu pliku:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Otrzymałeś plik %(filename)s od %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Przesłałeś plik %(filename)s do %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Nie można odszyfrować wiadomości od %s\n"
-"To mogło być sfałszowane."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Nie można odszyfrować wiadomości"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Konflikt nazw użytkownika"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Błąd."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Konflikt zasobów"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę "
-"podać nowy zasób"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Błąd podczas weryfikacji certyfikatu SSL"
-
-#: ../src/gajim.py:2167
-#, 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:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignoruj komunikat o tym błędzie."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Błąd certyfikatu SSL"
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-"Certyfikat SSL konta %(account)s 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:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Niezabezpieczone połączenie"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie.Czy jesteś "
-"pewien?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. "
-"Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "Węzeł PEP nie został usunięty"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "Węzeł PEP %(node)s nie został usunięty: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Emotoikony wyłączone"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą "
-"wyłączone."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Ustawiony przez ciebie styl emotikonów nie mógł zostać załadowany. Ty możesz "
-"potrzebować aktualizacji  formatu pliku emoticons.file. Aby poznać więcej "
-"szczegółów, zobacz http://trac.gajim.org/wiki/Emoticons."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Nie można zapisać twoich ustawień i opcji"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Wyświetla pomoc dla wybranego polecenia"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "polecenie"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: ../src/gajim-remote.py:94
-msgid ""
-"Prints a list of all contacts in the roster. Each contact appears on a "
-"separate line"
-msgstr ""
-"Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w "
-"osobnej linii"
-
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:93
+msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
+msgstr "Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w osobnej linii"
+
+#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listę zarejestrowanych kont"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Zmienia status kont lub kont"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr ""
-"jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
-"zajęty, niewidoczny "
+msgstr "jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, zajęty, niewidoczny "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:273
 msgid "message"
 msgstr "wiadomość"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "informacja o statusie"
 
-#: ../src/gajim-remote.py:112
-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 ""
-"zmień status konta \"konto\". Jeśli nie jest on określony, to spróbuj "
-"zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
-"statusem globalnym"
+#: ../src/gajim-remote.py:111
+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 "zmień status konta \"konto\". Jeśli nie jest on określony, to spróbuj zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze statusem globalnym"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Zmienia status kont lub kont"
+msgstr "Zmienia priorytet konta lub kont"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Priory_tet:"
+msgstr "priorytet"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Chcę za_rejestrować nowe konto Jabbera"
+msgstr "priorytet, jaki chcesz nadać"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"zmień status konta \"konto\". Jeśli nie jest on określony, to spróbuj "
-"zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
-"statusem globalnym"
+#: ../src/gajim-remote.py:121
+msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
+msgstr "zmień status podanego konta. Jeśli nie jest on określony, to spróbuj zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze statusem globalnym"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pokazuje okno dialogowe umożliwiające wysłanie wiadomości do kontaktu"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
-msgstr ""
-"jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
+msgstr "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
-msgid ""
-"Sends new chat message to a contact in the roster. Both OpenPGP key and "
-"account are optional. If you want to set only 'account', without 'OpenPGP "
-"key', just set 'OpenPGP key' to ''."
-msgstr ""
-"Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto "
-"nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
-"to ustaw 'klucz OpenPGP' na ''."
+#: ../src/gajim-remote.py:139
+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 "Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "klucz pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
-msgstr ""
-"jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
+msgstr "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta"
 
-#: ../src/gajim-remote.py:153
-msgid ""
-"Sends new single message to a contact in the roster. Both OpenPGP key and "
-"account are optional. If you want to set only 'account', without 'OpenPGP "
-"key', just set 'OpenPGP key' to ''."
-msgstr ""
-"Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto "
-"nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
-"to ustaw 'klucz OpenPGP' na ''."
+#: ../src/gajim-remote.py:152
+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 "Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "temat"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "temat wiadomości"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Wysyła nową wiadomość na czat, w którym uczestniczysz."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o koncie"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nazwa konta"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "plik"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "plik zostanie wysłany z tego konta, jeśli jest ono podane"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klucz' jest nazwą opcji, 'wartość' zaś jest jej ustawianą wartością"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Usuwa opcję"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "klucz"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nazwa opcji do usunięcia"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt do listy kontaktów"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Dodaje nowy kontakt do tego konta"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba, że zostało wskazane konto)."
 
-#: ../src/gajim-remote.py:243
-msgid ""
-"Returns current status message (the global one unless account is specified)"
+#: ../src/gajim-remote.py:242
+msgid "Returns current status message (the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Zwraca liczbę nieprzeczytanych wiadomości"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otwiera okno dialogowe 'Rozpocznij rozmowę'"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Rozpocznij rozmowę z tego konta"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Wysyła własny XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML do wysłania"
 
-#: ../src/gajim-remote.py:263
-msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle "
-"dane do wszystkich kont"
+#: ../src/gajim-remote.py:262
+msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
+msgstr "Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle dane do wszystkich kont"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsługuj URI xmpp:/"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI do obsługi"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "zawartość wiadomości"
+msgstr "Treść wiadomości"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Dołącz do nowego pokoju"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "pokój"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "Pokój:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Nick"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "hasło"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Hasło do pokoju"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Wskaż konto, z którym chcesz wejść do pokoju"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Pokazuje lub ukrywa okno iptyhon"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8686,15 +7847,15 @@ msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
 "Podaj konto, na które ma zostać wysłana ta wiadomość."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim nie jest uruchomiony, nie możesz więc użyć gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8703,16 +7864,16 @@ msgstr ""
 "Użyto: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8721,7 +7882,7 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8730,7 +7891,7 @@ msgstr ""
 "Za dużo argumentów. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8739,7 +7900,7 @@ msgstr ""
 "Argument \"%(arg)s\" nie jest określony. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Błędny adres URI"
 
@@ -8768,154 +7929,182 @@ msgstr "Nie możesz skasować obecnie używanego motywu"
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Nie jesteś już w pokoju \"%(room)s\" lub \"%(nick)s\" opuścił go."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Rozmowa z"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228
+#: ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
-msgstr ""
-"Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
+msgstr "Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, 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:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, 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:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288
+#: ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s występuje teraz jako %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326
+#: ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, 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:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "zamknięcie systemu"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, 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"
+msgstr "** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s przez %(actor)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
-msgstr ""
-"** Uprawnienia użytkownika %(nick)s zostały zmieniona na %(role)s przez %"
-"(actor)s"
+msgstr "** Uprawnienia użytkownika %(nick)s zostały zmieniona na %(role)s przez %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uprawnienia użytkownika %(nick)s została zmienione na %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473
+#: ../src/gui_interface.py:919
+#: ../src/history_window.py:442
+#: ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s ma teraz status %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, 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:1670
-msgid ""
-"If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1708
+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:1707
+#: ../src/groupchat_control.py:1712
+#: ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940
+#: ../src/gui_interface.py:1975
+#: ../src/message_window.py:227
+#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301
+#: ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Nie pytaj mnie o to ponownie"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 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:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8923,22 +8112,23 @@ msgstr ""
 "Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968
+#: ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -8948,12 +8138,8 @@ msgid "A programming error has been detected"
 msgstr "Wykryto błąd programistyczny"
 
 #: ../src/gtkexcepthook.py:47
-msgid ""
-"It probably is not fatal, but should be reported to the developers "
-"nonetheless."
-msgstr ""
-"Nie jest prawdopodnie krytyczny, ale powinien zostać mimo to zgłoszony "
-"deweloperom."
+msgid "It probably is not fatal, but should be reported to the developers nonetheless."
+msgstr "Nie jest prawdopodnie krytyczny, ale powinien zostać mimo to zgłoszony deweloperom."
 
 #: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
@@ -8964,60 +8150,443 @@ msgid "Details"
 msgstr "Szczegóły"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Błąd odczytu pliku:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Błąd przetwarzania pliku:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr ""
-"Nie można zapisywać do %s. Wsparcie dla Menadżera Sesji nie będzie działać"
+msgstr "Nie można zapisywać do %s. Wsparcie dla Menadżera Sesji nie będzie działać"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie jest domyślnym klinetem Jabbera"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Czy chciałbyś by Gajim stał się klientem domyślnym?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Przy starcie sprawdzaj czy Gajim jest domyślnym klinetem Jabbera"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr ""
-"Obraz nie może zostać zapisany w formacie %(type)s. Zapisać jako %"
-"(new_filename)s?"
+msgstr "Obraz nie może zostać zapisany w formacie %(type)s. Zapisać jako %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Pożądany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś innego w pokoju %s.\n"
+"Podaj inny pseudonim:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "W przypadku konfliktu zawsze używaj tego pseudonimu"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Czy akceptujesz tę prośbę?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Czy akceptujesz tę prośbę na koncie %s?"
+
+#: ../src/gui_interface.py:154
+#, 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/gui_interface.py:205
+#: ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Połączenie nie powiodło się"
+
+#: ../src/gui_interface.py:544
+#: ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Błąd %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558
+#: ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599
+#: ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Prośba o autoryzację"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autoryzacja przyjęta"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Zawsze będziesz widział ten kontakt jako rozłączony.\n"
+"Czy chcesz go usunąć z listy kontaktów?"
+
+#: ../src/gui_interface.py:663
+#: ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Cofnij autoryzację"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Nie można ustanowić połączenia z \"%s\""
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s ustawił temat na %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Lista zawiera teraz niedostępnych uczestników"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "lista nie zawiera teraz niedostępnych użytkowników"
+
+#: ../src/gui_interface.py:1058
+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/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Pokój nie jest już anonimowy"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Pokój jest teraz quasi-anonimowy"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Pokój jest teraz w pełni anonimowy"
+
+#: ../src/gui_interface.py:1103
+#, 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/gui_interface.py:1137
+msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
+msgstr "Skonfigurowałeś Gajima by używał agenta GPG, ale agent nie jest uruchomiony lub zwraca błędne hasło.\n"
+
+#: ../src/gui_interface.py:1139
+#: ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Twoje hasło jest niepoprawne"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Niepoprawne hasło OpenPGP"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG nie jest zaufany"
+
+#: ../src/gui_interface.py:1170
+msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
+msgstr "Klucz GPG używany do szyfrowania tej rozmowy nie jest zaufany. Czyn naprawdę chcesz zaszyfrować tą wiadomość?"
+
+#: ../src/gui_interface.py:1182
+msgid "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment variable probably not \t\t\t\tcorrectly set)"
+msgstr "Menedżer bazy kluczy GNOME jest zainstalowany, ale nie został \t\t\t\tprawidłowo uruchomiony(zmienna środowiskowa prawdopodobnie nie jest \t\t\t\t właściwie ustawiona)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Masz %d nieprzeczytaną wiadomość pocztową"
+msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
+msgstr[2] "Masz %d nieprzeczytane wiadomości pocztowe"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Od: %(from_address)s\n"
+"Temat: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s chce przesłać ci plik."
+
+#: ../src/gui_interface.py:1417
+#: ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Druga strona przerwała transfer"
+
+#: ../src/gui_interface.py:1419
+#: ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Błąd odczytu pliku"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Otrzymałeś plik %(filename)s od %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, 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/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Przesłałeś plik %(filename)s do %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, 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/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Nie można odszyfrować wiadomości od %s\n"
+"To mogło być sfałszowane."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Nie można odszyfrować wiadomości"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Konflikt nazw użytkownika"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Błąd."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Konflikt zasobów"
+
+#: ../src/gui_interface.py:1722
+msgid "You are already connected to this account with the same resource. Please type a new one"
+msgstr "Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę podać nowy zasób"
+
+#: ../src/gui_interface.py:1771
+#, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s chce rozpocząć rozmowę głosową."
+
+#: ../src/gui_interface.py:1774
+msgid "Voice Chat Request"
+msgstr "Prośba o rozmowę głosową"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Błąd podczas weryfikacji certyfikatu SSL"
+
+#: ../src/gui_interface.py:1880
+#, 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/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignoruj komunikat o tym błędzie."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Błąd certyfikatu SSL"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Certyfikat SSL konta %(account)s 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/gui_interface.py:1936
+#: ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Niezabezpieczone połączenie"
+
+#: ../src/gui_interface.py:1937
+msgid "You are about to send your password on an unencrypted connection. Are you sure you want to do that?"
+msgstr "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie.Czy jesteś pewien?"
+
+#: ../src/gui_interface.py:1939
+#: ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
+
+#: ../src/gui_interface.py:1972
+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 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "Węzeł PEP nie został usunięty"
+
+#: ../src/gui_interface.py:1993
+#, 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/gui_interface.py:2547
+#: ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Emotoikony wyłączone"
+
+#: ../src/gui_interface.py:2548
+msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
+msgstr "Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą wyłączone."
+
+#: ../src/gui_interface.py:2570
+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 "Ustawiony przez ciebie styl emotikonów nie mógł zostać załadowany. Ty możesz potrzebować aktualizacji  formatu pliku emoticons.file. Aby poznać więcej szczegółów, zobacz http://trac.gajim.org/wiki/Emoticons."
+
+#: ../src/gui_interface.py:2598
+#: ../src/roster_window.py:3441
+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/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Nie można zapisać twoich ustawień i opcji"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Wymagane hasło"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "Klucz GPG stracił ważność"
+
+#: ../src/gui_interface.py:3478
+#, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Twój klucz GPG stracił ważność, zostaniesz połączony z %s bez OpenGPG"
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Błędne hasło"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Nowa rozmowa grupowa"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
@@ -9031,500 +8600,457 @@ msgid "Contacts"
 msgstr "Kontakty"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_manager.py:174
+#: ../src/history_manager.py:214
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:180
+#: ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_manager.py:188
+#: ../src/history_manager.py:220
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Wiadomość"
 
 #: ../src/history_manager.py:248
-msgid ""
-"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
-"RUNNING)"
-msgstr ""
-"Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ "
-"OPCJI GDY GAJIM JEST URUCHOMIONY)"
+msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+msgstr "Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ OPCJI GDY GAJIM JEST URUCHOMIONY)"
 
 #: ../src/history_manager.py:250
 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 ""
-"Standardowo baza danych przechowująca logi rozmów nie zminiejsza swojego "
-"rozmiaru - usunięte elementy zwalniają po prostu miejsce dla nowych danych. "
-"Jeżeli naprawdę chcesz zminejszyć rozmiar bazy danych kliknij TAK, w "
-"przeciwnym wypadku wybierz NIE.\n"
+"Standardowo baza danych przechowująca logi rozmów nie zminiejsza swojego rozmiaru - usunięte elementy zwalniają po prostu miejsce dla nowych danych. Jeżeli naprawdę chcesz zminejszyć rozmiar bazy danych kliknij TAK, w przeciwnym wypadku wybierz NIE.\n"
 "\n"
 "Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Przenoszenie logów rozmów..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o godzinie %(time)s napisał: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Czy na pewno chcesz usunąć historię rozmów wybranego kontaktu?"
 msgstr[1] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
 msgstr[2] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583
+#: ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Skutków tej operacji nie można będzie wycofać."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Czy na pewno chcesz usunąć wybraną wiadomość?"
 msgstr[1] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 msgstr[2] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historia rozmowy z %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Błąd zapisu lub odczytu na dysku"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s jes teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Komunikat błędu: %s"
+msgstr "Błąd: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Błąd."
+msgstr "Błąd"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Obecny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513
+#: ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Przekroczono czas ładowania obrazu"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Obraz jest za duży"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
 msgstr "Ty zamierzasz zamknąć wszystkie zakładki"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Rozmowy"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Czaty"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- wiadomości będzie logowanych"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- wiadomości nie będzie logowanych"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nowa wiadomość prywatna z pokoju %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110
+#: ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113
+#: ../src/roster_window.py:2848
 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:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127
+#: ../src/profile_window.py:143
+#: ../src/roster_window.py:2850
+#: ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informacja została odebrana"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Nie możesz wysłać informacji o sobie jeśli nie jesteś połączony."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Wysyłanie profilu..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informacja NIE ZOSTAŁA opublikowana"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: ../src/profile_window.py:355
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
-"później."
+#: ../src/profile_window.py:362
+msgid "There was an error while publishing your personal information, try again later."
+msgstr "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie później."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280
+#: ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, 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."
+msgstr "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, 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:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG nie nadaje się do użycia"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
+
+#: ../src/roster_window.py:2148
+#: ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-msgstr ""
-"Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
-"pewno chcesz stać się niewidoczny?"
+#: ../src/roster_window.py:2149
+#: ../src/roster_window.py:3395
+msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
+msgstr "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "rozsynchronizowany"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Na pewno zamknąć Gajima?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
+msgstr "Na pewno chcesz opuścić program?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Zawsze zamykaj Gajima"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2351
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled and contact is in your roster."
-msgstr ""
-"Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz "
-"włączoną obsługę historii."
+#: ../src/roster_window.py:2334
+msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
+msgstr "Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz włączoną obsługę historii."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:2592
-msgid ""
-"You will no longer be able to send and receive messages from contacts using "
-"this transport."
-msgstr ""
-"Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
-"tego transportu."
+#: ../src/roster_window.py:2581
+msgid "You will no longer be able to send and receive messages from contacts using this transport."
+msgstr "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą tego transportu."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
-msgid ""
-"You will no longer be able to send and receive messages to contacts from "
-"these transports: %s"
-msgstr ""
-"Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
-"następujących transportów: %s"
+msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
+msgstr "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą następujących transportów: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
-msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
+msgstr "Czy na pewno chcesz zablokować kontakt?"
 
-#: ../src/roster_window.py:2664
-msgid ""
-"This contact will see you offline and you will not receive messages he will "
-"send you."
-msgstr ""
+#: ../src/roster_window.py:2655
+msgid "This contact will see you offline and you will not receive messages he will send you."
+msgstr "Ten kontakt będzie Cię widział jako rozłączonego. Nie otrzymasz też od niego żadnych komunikatów."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, 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:2800
+#: ../src/roster_window.py:2793
 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:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, 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:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
-msgstr ""
-"Ty zamierzasz usunąć \"%(name)s\" (%(jid)s) ze swojej listy kontaktów.\n"
+msgstr "Ty zamierzasz usunąć \"%(name)s\" (%(jid)s) ze swojej listy kontaktów.\n"
 
-#: ../src/roster_window.py:3210
-msgid ""
-"By removing this contact you also remove authorization resulting in him or "
-"her always seeing you as offline."
-msgstr ""
-"Usuwając kontakt cofniesz mu również autoryzację, co spowoduje, że kontakt "
-"będzie zawsze widział Cię jako rozłączonego."
+#: ../src/roster_window.py:3217
+msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
+msgstr "Usuwając kontakt cofniesz mu również autoryzację, co spowoduje, że kontakt będzie zawsze widział Cię jako rozłączonego."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Czy chcesz kontynuować?"
 
-#: ../src/roster_window.py:3219
-msgid ""
-"By removing this contact you also by default remove authorization resulting "
-"in him or her always seeing you as offline."
-msgstr ""
-"Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
-"będzie zawsze widział Cię jako rozłączonego."
+#: ../src/roster_window.py:3226
+msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
+msgstr "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 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:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Usuwając kontakty: %s\n"
-"cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
-"jako rozłączony."
+"cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny jako rozłączony."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
-msgid ""
-"You are about to send a custom status. Are you sure you want to continue?"
-msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
+#: ../src/roster_window.py:3295
+msgid "You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Chcesz ustawić indywidualny status. Na pewno chcesz kontynuować?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
-msgid ""
-"This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 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:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:3879
-msgid ""
-"Your server does not support storing metacontacts information. So those "
-"information will not be saved on next reconnection."
-msgstr ""
-"Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
-"zostanie przywrócona podczas następnego połączenia."
+#: ../src/roster_window.py:3899
+msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
+msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie zostanie przywrócona podczas następnego połączenia."
 
-#: ../src/roster_window.py:3964
-msgid ""
-"You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:3984
+msgid "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:3966
-msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generally it "
-"is used when the same person has several Jabber accounts or transport "
-"accounts."
-msgstr ""
-"Metakontakty są sposobem na zgrupowanie kilku kontaktów w jednej linii "
-"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:3986
+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 "Metakontakty są sposobem na zgrupowanie kilku kontaktów w jednej linii 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:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9532,12 +9058,12 @@ msgstr[0] "Czy chcesz wysłać ten plik do %s:"
 msgstr[1] "Czy chcesz wysłać te pliki do %s:"
 msgstr[2] "Czy chcesz wysłać te pliki do %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Wyślij %s"
+msgstr "Wyślij %s do %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
@@ -9547,157 +9073,165 @@ msgstr "Przekształć %s oraz %s w metakontakty"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718
+#: ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798
+#: ../src/statusicon.py:248
+#: ../src/statusicon.py:295
+#: ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847
+#: ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Zarządzaj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963
+#: ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Konfiguruj Usługi..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153
+#: ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Wyślij wiadomość"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Wykonaj komendę..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Zarządzaj transportami"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Rozłącz"
+msgstr "_Połącz ponownie"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Rozłącz"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Zmień opis statusu..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Oczekiwanie na wyniki"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132
+#: ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Błąd w odebranych danych"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166
+#: ../src/search_window.py:202
 msgid "No result"
 msgstr "Brak wyników"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Błąd zapisu na dysk"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Temat: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429
+#: ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Potwierdź opcje sesji"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9706,14 +9240,13 @@ msgid ""
 "\n"
 "\tAre these options acceptable?"
 msgstr ""
-"Zdalny klient chce przeprowadzić negocjację sesji z poniższymi "
-"ustawieniami:\n"
+"Zdalny klient chce przeprowadzić negocjację sesji z poniższymi ustawieniami:\n"
 "\n"
 "\t\t%s\n"
 "\n"
 "\t\tCzy akceptujesz te ustawienia?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9728,116 +9261,121 @@ msgstr ""
 "\n"
 "Kontynuować?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Zmień opis statusu..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347
+#: ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350
+#: ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Zasoby: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tego pokoju"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [zablokowany]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [zminimalizowany]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474
+#: ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Ostatni status %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Rozłączony"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Utwór"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664
+#: ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670
+#: ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Ukończony"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?status transferu:wstrzymany"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Ta usługa nie odesłała jeszcze szczegółowych informacji"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9845,86 +9383,114 @@ msgstr ""
 "Ta usługa nie była w stanie odesłać szczegółowych informacji.\n"
 "Prawdopodobnie została zamknięta lub jest zepsuta"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
 msgstr "?Czas: Nieznany"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299
+#: ../src/vcard.py:309
+#: ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Grupy:</b>"
 
-#: ../src/vcard.py:339
-msgid ""
-"This contact is interested in your presence information, but you are not "
-"interested in his/her presence"
-msgstr ""
-"Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
-"interesujesz się jego/jej statusem."
+#: ../src/vcard.py:344
+msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+msgstr "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:341
-msgid ""
-"You are interested in the contact's presence information, but he/she is not "
-"interested in yours"
-msgstr ""
-"Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
-"jest zainteresowana twoim."
+#: ../src/vcard.py:346
+msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+msgstr "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie jest zainteresowana twoim."
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
 
 #. None
-#: ../src/vcard.py:345
-msgid ""
-"You are not interested in the contact's presence, and neither he/she is "
-"interested in yours"
-msgstr ""
-"Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
-"jest zainteresowany twoim"
+#: ../src/vcard.py:350
+msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+msgstr "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie jest zainteresowany twoim"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Oczekujesz na odpowiedź kontaktu dotyczącą prośby o autoryzację"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Nie ma oczekujących żądań autoryzacji."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364
+#: ../src/vcard.py:418
+#: ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "Wiadomość _otrzymana:"
+#~ msgid "_Outgoing message:"
+#~ msgstr "Wysłana wiadomość :"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-close"
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Nazwa hosta %s, którą określiłeś w opcji ft_add_hosts_to_send jest "
+#~ "niepoprawna, będzie więc ignorowana."
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Nie podano klucza OpenPGP"
+#~ 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ć."
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Nie jesteś połączony, lub masz status 'niewidoczny'. Twoja wiadomość nie "
+#~ "mogła zostać wysłana."
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Ta wiadomość jest zaszyfrowana]"
+#~ msgid "%i days ago"
+#~ msgstr "%i dni temu"
+#~ msgid "Trayicon"
+#~ msgstr "Ikona w obszarze powiadamiania"
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Ikona w obszarze powiadamiania odzwierciedla aktualny status."
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Wymaga python-gnome2-extras lub skompilowanego modułu trayicon ze źródeł "
+#~ "Gajima."
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Wymaga PyGTK >= 2.10."
 #~ msgid "Add Special _Notification"
 #~ msgstr "Dodaj powiadomienia _specjalne"
-
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Przypisz klucz Open_PGP"
-
 #~ msgid "Command not supported for zeroconf account."
 #~ msgstr "Komenda nie jest wspierana dla konta zeroconf."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Polecenia: %s"
-
 #~ msgid "Usage: /%s, clears the text window."
 #~ msgstr "Użycie: /%s czyście okno tekstowe."
-
 #~ msgid "Usage: /%s, hide the chat buttons."
 #~ msgstr "Użycie: /%s ukrywa przyciski czatu."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -9932,25 +9498,18 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Użycie: /%(command)s <działanie> spowoduje wysłanie działania do "
 #~ "aktualnego pokoju. Używaj w trzeciej osobie. (np. /%(command)s "
 #~ "eksploduje.)"
-
 #~ msgid "Usage: /%s, sends a ping to the contact"
 #~ msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
-
 #~ msgid "Usage: /%s, send the message to the contact"
 #~ msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Brak informacji o pomocy dla /%s"
-
 #~ msgid "Enable link-local/zeroconf messaging"
 #~ msgstr "Uaktywnij komunikację link-local/zeroconf"
-
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Pseudonim nie został odnaleziony: %s"
-
 #~ msgid "This group chat has no subject"
 #~ msgstr "Ten pokój nie ma tematu"
-
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
@@ -9967,26 +9526,22 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Użycie: /%s <pseudonim|JID> [powód] banuje JID w pokoju. Pseudonim osoby "
 #~ "może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
 #~ "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
-
 #~ msgid ""
 #~ "Usage: /%s <nickname>, opens a private chat window with the specified "
 #~ "occupant."
 #~ msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą."
-
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
 #~ "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, "
 #~ "jeśli został podany."
-
 #~ msgid ""
 #~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
 #~ "optionally providing a reason."
 #~ msgstr ""
 #~ "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 #~ "wyświetlając powód."
-
 #~ msgid ""
 #~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
 #~ "optionally using specified nickname."
@@ -10001,25 +9556,20 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgstr ""
 #~ "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
 #~ "pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
-
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
 #~ "message to the occupant specified by nickname."
 #~ msgstr ""
 #~ "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
 #~ "wysyła ją do osoby o takim pseudonimie."
-
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
-
 #~ msgid "Usage: /%s , display the names of group chat occupants."
 #~ msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
 #~ "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
-
 #~ msgid ""
 #~ "Usage: /%s <message>, sends a message without looking for other commands."
 #~ msgstr ""
@@ -10030,103 +9580,73 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
 #~ "messages."
 #~ msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
-
 #~ msgid "B_OSH Port:"
 #~ msgstr "B_OSH Port:"
-
 #~ msgid "Show _roster"
 #~ msgstr "Pokaż _listę kontaktów"
-
 #~ msgid "Always use OS/X default applications"
 #~ msgstr "Zawsze używaj domyślnych apikacji OS X"
-
 #~ msgid "Custom"
 #~ msgstr "Własne"
-
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę"
-
 #~ msgid "Generic"
 #~ msgstr "Ogólne"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
-
 #~ msgid ""
 #~ "%(title)s by %(artist)s\n"
 #~ "from %(source)s"
 #~ msgstr "\"%(title)s\" w wykonaniu %(artist)sz %(source)s"
-
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Kliknij by zobaczyć możliwości serwerów jabbera (np. transporty MSN czy "
 #~ "ICQ)"
-
 #~ msgid "Servers Features"
 #~ msgstr "Możliwości serwerów"
-
 #~ msgid "Your JID:"
 #~ msgstr "Twój JID:"
-
 #~ msgid "Name:"
 #~ msgstr "Nazwa:"
-
 #~ msgid "_Host:"
 #~ msgstr "_Host:"
-
 #~ msgid "Modify Account"
 #~ msgstr "Modyfikuj konto"
-
 #~ 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"
-
 #~ msgid "gajim-remote"
 #~ msgstr "gajim-remote"
-
 #~ msgid "OpenGPG"
 #~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "Baza kluczy GNOME"
-
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compilation of gtkspell module from "
 #~ "Gajim sources."
 #~ msgstr ""
 #~ "Wymaga python-gnome2-extras lub kompilacji gtkspell ze źródeł Gajima."
-
 #~ msgid "Notification-daemon"
 #~ msgstr "Powiadamianie o zdarzeniach"
-
 #~ msgid "Idle"
 #~ msgstr "Stan bezczynności"
-
 #~ msgid "Requires compilation of the idle module from Gajim sources."
 #~ msgstr "Wymaga kompilacji modułu idle ze źródeł Gajima."
-
 #~ msgid "libsexy"
 #~ msgstr "libsexy"
-
 #~ 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 "
 #~ "żadnego klucza"
-
 #~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 #~ msgstr ""
 #~ "Nie ma takiego polecenia: /%s (jeśli chcesz je wysłać, poprzedź je "
@@ -10147,38 +9667,28 @@ msgstr " zasób o wysokim priorytecie "
 #, fuzzy
 #~ msgid "Encryption disabled"
 #~ msgstr "Szyfrowanie E2E wyłączone"
-
 #~ msgid ""
 #~ "If checked, Gajim will sort contacts in roster window and groupchats by "
 #~ "their status and not by the shown name"
 #~ msgstr ""
 #~ "Zaznaczenie tej opcji spowoduje posortowanie listy kontaktów według ich "
 #~ "statusu a nie według nazw"
-
 #~ msgid "The username used to identify the Last.fm account."
 #~ msgstr "Nazwa użytkownika serwisu Last.fm."
-
 #~ msgid "Network Manager support not available"
 #~ msgstr "Brak wsparcia dla Network Managera"
-
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Wsparcie dla Menadżera Sesji jest niedostępne (brak modułu gnome.ui"
-
 #~ msgid "E2E encryption enabled"
 #~ msgstr "Szyfrowanie E2E włączone"
-
 #~ msgid "General:"
 #~ msgstr "Ogólne"
-
 #~ msgid "Message:"
 #~ msgstr "Wiadomość"
-
 #~ msgid "Close"
 #~ msgstr "Zamknij"
-
 #~ msgid "_Make message windows compact"
 #~ msgstr "_Spraw, by okna wiadomości były zwarte"
-
 #~ msgid "A_ccounts"
 #~ msgstr "_Konta"
 
@@ -10189,63 +9699,46 @@ msgstr " zasób o wysokim priorytecie "
 #, fuzzy
 #~ msgid "The following message was "
 #~ msgstr "Ta wiadomość została jest zaszyfrowana"
-
 #~ msgid "%s is now %s"
 #~ msgstr "%s ma teraz status %s"
-
 #~ msgid "cold"
 #~ msgstr "Zziębnięty"
-
 #~ msgid "hot"
 #~ msgstr "napalony"
-
 #~ msgid "moody"
 #~ msgstr "markotny"
-
 #~ msgid "working"
 #~ msgstr "pracuję"
-
 #~ msgid "eating"
 #~ msgstr "jem"
-
 #~ msgid "inactive"
 #~ msgstr "nieaktywny"
-
 #~ msgid "walking"
 #~ msgstr "Spaceruję"
-
 #~ msgid "sleeping"
 #~ msgstr "Śpię"
-
 #~ msgid "other"
 #~ msgstr "Inne czynności"
 
 #, fuzzy
 #~ msgid "mood"
 #~ msgstr "markotny"
-
 #~ msgid ""
 #~ "Usage: %s %s %s \n"
 #~ "\t %s"
 #~ msgstr ""
 #~ "Użycie: %s %s %s \n"
 #~ "\t %s"
-
 #~ msgid "%s - %s"
 #~ msgstr "%s - %s"
-
 #~ msgid "Click to see past conversations with this contact"
 #~ msgstr "Kliknij by zobaczyć poprzednie rozmowy z tym kontaktem"
-
 #~ msgid "Click to see past conversation in this room"
 #~ msgstr "Kliknij by zobaczyć poprzednie rozmowy w tym pokoju"
-
 #~ msgid "<b>History Viewer</b>"
 #~ msgstr "<b>Przeglądanie historii</b>"
-
 #~ msgid "<b>JID Selection</b>"
 #~ msgstr "<b>Wybór JID-a</b>"
-
 #~ msgid ""
 #~ "Choose the chatlog you want to view. \n"
 #~ "Enter the jid of a groupchat or a contact here. For online accounts you "
@@ -10254,38 +9747,28 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Wybierz katalog, który chcesz przejrzeć. \n"
 #~ "Tu wpisz JID czatu lub kontaktu. Jeżeli kontakt jest online, możesz podać "
 #~ "sam nick."
-
 #~ msgid "in"
 #~ msgstr "w"
-
 #~ msgid "Accept"
 #~ msgstr "Akceptuj"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Zaproszenie Odebrane"
-
 #~ msgid "<b>Publish and Subscribe</b>"
 #~ msgstr "<b>Publikuj i subskrybuj</b>"
-
 #~ msgid "Allow others to see your:"
 #~ msgstr "_Pozwól innym widzieć swój:"
-
 #~ msgid "Receive your contact's:"
 #~ msgstr "Odbieraj powiadomomienia o zmianie:"
-
 #~ msgid "Tune"
 #~ msgstr "Muzyka"
-
 #~ msgid ""
 #~ "\n"
 #~ "From: %(from_address)s"
 #~ msgstr ""
 #~ "\n"
 #~ "Od: %(from_address)s"
-
 #~ msgid "OK to continue with negotiation?"
 #~ msgstr "Czy kontynuować negocjację?"
-
 #~ 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"
@@ -10303,61 +9786,46 @@ msgstr " zasób o wysokim priorytecie "
 #~ "pośrednictwem telefonu i potwierdzić, że jej SAS (Short Authentication "
 #~ "String) jest identyczny z poniższym: %s\n"
 #~ "Czy chcesz kontynuować tą sesję?"
-
 #~ msgid "Yes, I verified the Short Authentication String"
 #~ msgstr "Tak, SAS został zweryfikowany."
-
 #~ msgid ""
 #~ "To continue, Gajim needs to access your stored secrets. Enter your "
 #~ "passphrase"
 #~ msgstr ""
 #~ "Aby kontynuować, Gajim musi uzyskać dostęp do Twoich haseł. Proszę podać "
 #~ "hasło główne"
-
 #~ msgid "Confirm Passphrase"
 #~ msgstr "Potwierdź hasło"
-
 #~ msgid "Enter your new passphrase again for confirmation"
 #~ msgstr "Wpisz ponownie nowe hasło"
-
 #~ msgid "Create Passphrase"
 #~ msgstr "Utwórz hasło"
-
 #~ msgid "Passphrases did not match.\n"
 #~ msgstr "Hasła nie zgadzają się.\n"
-
 #~ msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
 #~ msgstr "Proszę podać hasło główne służące do zaszyfrowania danych poufnych"
-
 #~ msgid "Role:"
 #~ msgstr "Funkcja:"
-
 #~ msgid "Affiliation:"
 #~ msgstr "Afiliacja: "
-
 #~ msgid ""
 #~ "If checked, Gajim can regularly poll a Last.fm account and sends recently "
 #~ "played songs through PEP."
 #~ msgstr ""
 #~ "Po zaznaczeniu tej opcji Gajim będzie wysyłał (via PEP) do serwisu Last."
 #~ "fm informacje o odtwarzanych utworach."
-
 #~ msgid ""
 #~ "When negotiating an encrypted session, should Gajim prefer to use public "
 #~ "keys for identification?"
 #~ msgstr ""
 #~ "Czy podczas negocjowania szyfrowanej sesji Gajim ma kluczy publicznych?"
-
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Nie można ustanowić połączenia z hostem"
-
 #~ msgid ""
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr "Nie można ustanowić połączenia z hostem. Nieprawidłowa odpowiedź."
-
 #~ msgid "<b>Format of a line</b>"
 #~ msgstr "<b>Format linii</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 "
@@ -10366,7 +9834,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Przykład: jeżeli ustawiłeś status opisowy dla stanu 'nieobecny', Gajim "
 #~ "zapamięta go i nie będzie prosił o jego zmianę po ponownym ustawieniu "
 #~ "takiego stanu"
-
 #~ msgid ""
 #~ "Determined by sender\n"
 #~ "Chat message\n"
@@ -10375,13 +9842,10 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Określa nadawca\n"
 #~ "Rozmowę\n"
 #~ "Pojedynczą wiadomość"
-
 #~ msgid "Events"
 #~ msgstr "Zdarzenia"
-
 #~ msgid "Hides buttons in chatwindows to "
 #~ msgstr "Ukrywa przyciski w oknie czatu "
-
 #~ msgid ""
 #~ "Never\n"
 #~ "Always\n"
@@ -10392,25 +9856,18 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Zawsze\n"
 #~ "Według konta\n"
 #~ "Według typu"
-
 #~ msgid "Privacy"
 #~ msgstr "Prywatność"
-
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "Wyświetlaj informacje o odtwarzanej _muzyce w statusie opisowym"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Automatyczny status \"Zaraz wracam\""
-
 #~ msgid "The auto not available status message"
 #~ msgstr "Automatyczny status \"Nieobecny\""
-
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Traktuj wszystkie otrzymane wiadomości jako:"
-
 #~ msgid "Use only one message _window:"
 #~ msgstr "_Grupuj okna:"
-
 #~ msgid ""
 #~ "Works for Rhythmbox and Muine players. For more players, please visit "
 #~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
@@ -10418,79 +9875,54 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Funkcja ta działa z programami Rhythmbox oraz Muine. Jeżeli zależy ci na "
 #~ "obsłudze innego oprogramowania, odwiedź stronę http://trac.gajim.org/wiki/"
 #~ "GajimAndMusicPlayer"
-
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Edytor zaawansowanych ustawień"
-
 #~ msgid "_Player:"
 #~ msgstr "_Program odtwarzający dźwięk:"
-
 #~ msgid "City:"
 #~ msgstr "Miasto:"
-
 #~ msgid "Company:"
 #~ msgstr "Firma:"
-
 #~ msgid "Country:"
 #~ msgstr "Kraj:"
-
 #~ msgid "Given:"
 #~ msgstr "Imię:"
-
 #~ msgid "Middle:"
 #~ msgstr "Drugie imię:"
-
 #~ msgid "Position:"
 #~ msgstr "Stanowisko:"
-
 #~ msgid "Prefix:"
 #~ msgstr "Prefiks:"
-
 #~ msgid "State:"
 #~ msgstr "Stan/Województwo:"
-
 #~ msgid "Suffix:"
 #~ msgstr "Sufiks:"
-
 #~ msgid "Ask:"
 #~ msgstr "Pytaj:"
-
 #~ msgid "Client:"
 #~ msgstr "Klient:"
-
 #~ msgid "OS:"
 #~ msgstr "System operacyjny:"
-
 #~ msgid "Subscription:"
 #~ msgstr "Autoryzacja:"
-
 #~ msgid "You will always see him or her as offline."
 #~ msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
-
 #~ msgid "%s is now %s (%s)"
 #~ msgstr "%s ma teraz status %s (%s)"
-
 #~ msgid "%s - Gajim"
 #~ msgstr "%s - Gajim"
-
 #~ msgid "_New group chat"
 #~ msgstr "_Nowa rozmowa grupowa"
-
 #~ msgid "_Log off"
 #~ msgstr "R_ozłącz"
-
 #~ msgid "_Log on"
 #~ msgstr "_Połącz"
-
 #~ msgid "Save passphrase"
 #~ msgstr "Zapisz hasło"
-
 #~ msgid "Connected to server %s:%s with %s"
 #~ msgstr "Połączony z serwerem %s: %s z %s"
-
 #~ msgid "Build custom query"
 #~ msgstr "Stwórz własne zapytanie"
-
 #~ 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"
@@ -10498,16 +9930,12 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Wprowadź nazwę użytkownika z rostera lub czatu aby przejrzeć historię "
 #~ "rozmów.\n"
 #~ "Jeżeli jest połączony, możesz podać jego nazwę.\n"
-
 #~ msgid "Query Builder..."
 #~ msgstr "Kreator zapytań..."
-
 #~ msgid "_Discover Services..."
 #~ msgstr "_Wyszukuj usługi..."
-
 #~ msgid "_Retype Password:"
 #~ msgstr "_Powtórz hasło:"
-
 #~ 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 "
@@ -10519,85 +9947,65 @@ msgstr " zasób o wysokim priorytecie "
 #~ "lokalnej kontakty używające klienta wykorzystującego technologię Bonjour "
 #~ "(jak iChat, Trillian czy Gaim) pojawią się na rosterze. Nie musisz łączyć "
 #~ "się z serwerem Jabbera, by z nimi rozmawiać."
-
 #~ msgid ""
 #~ "If you have 2 or more accounts and this is checked, Gajim will list all "
 #~ "contacts as if you had one account"
 #~ msgstr ""
 #~ "Jeśli masz dwa konta lub więcej, to dzięki tej opcji Gajim pokaże "
 #~ "wszystkie kontakty w taki sposób, jakby było to jedno konto"
-
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "_Uaktywnij przesyłanie wiadomości do adresów link-local"
-
 #~ msgid "_Blocked Contacts"
 #~ msgstr "_Kontakty zablokowane"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "Widok _zwarty    Alt+C"
-
 #~ msgid "<b>Interface Customization</b>"
 #~ msgstr "<b>Własne ustawienia interfejsu</b>"
-
 #~ msgid "Also known as iChat style"
 #~ msgstr "Znany także jako styl iChat"
-
 #~ msgid "Chat"
 #~ msgstr "Rozmowa"
-
 #~ msgid "E_very 5 minutes"
 #~ msgstr "Co 5 _minut"
-
 #~ msgid ""
 #~ "Gajim will automatically show new events by popping up the relevant window"
 #~ msgstr ""
 #~ "Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej "
 #~ "karcie otwartego okna rozmowy"
-
 #~ msgid ""
 #~ "Gajim will notify you for new events via a popup in the bottom right of "
 #~ "the screen"
 #~ msgstr ""
 #~ "Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
 #~ "prawym dolnym rogu ekranu"
-
 #~ msgid ""
 #~ "Gajim will notify you via a popup window in the bottom right of the "
 #~ "screen about contacts that just signed in"
 #~ msgstr ""
 #~ "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 #~ "kontaktach, które zmieniają status na Dostępny"
-
 #~ msgid ""
 #~ "Gajim will only change the icon of the contact that triggered the new "
 #~ "event"
 #~ msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość"
-
 #~ 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 ""
 #~ "Zaznaczenie tej opcji spowoduje zapamiętanie położenia głównego okna "
 #~ "programu na ekranie oraz jego rozmiaru"
-
 #~ msgid "On every _message"
 #~ msgstr "W każdej _wiadomości"
-
 #~ msgid "Outgoing Chat state noti_fications:"
 #~ msgstr "Wysyłanie powiadomienia o stanie _rozmowy:"
-
 #~ msgid "Print time:"
 #~ msgstr "Wyświetlaj czas:"
-
 #~ msgid "Save _position and size for roster and chat windows"
 #~ msgstr "Zapisz _pozycję i rozmiar okna kontaktów i okna rozmowy"
-
 #~ msgid "Show only in _roster"
 #~ msgstr "Pokaż tylko _listę kontaktów"
-
 #~ msgid "Use t_rayicon (aka. notification area icon)"
 #~ msgstr "_Ikona w obszarze powiadamiania"
-
 #~ 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 "
@@ -10608,28 +10016,20 @@ msgstr " zasób o wysokim priorytecie "
 #~ "itp.), możesz zostać o tym powiadomiony na takie sposoby. UWAGA: Nowa "
 #~ "wiadomość pojawia się jeśli nie pochodzi od osoby, z którą aktualnie "
 #~ "rozmawiasz"
-
 #~ msgid "_Never"
 #~ msgstr "_Nigdy"
-
 #~ msgid "_Notify me about it"
 #~ msgstr "Powia_dom mnie o tym"
-
 #~ msgid "_Pop it up"
 #~ msgstr "_Wyświetl"
-
 #~ msgid "Send cus_tom status"
 #~ msgstr "Wyślij _odrębny status"
-
 #~ msgid "_Remove from Roster"
 #~ msgstr "_Usuń z listy kontaktów"
-
 #~ msgid "_Filter:"
 #~ msgstr "_Filtr:"
-
 #~ msgid "Click to force avatar"
 #~ msgstr "Kliknij aby ustawić avatar"
-
 #~ 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 "
@@ -10644,125 +10044,87 @@ msgstr " zasób o wysokim priorytecie "
 #~ "in /etc/profile.\n"
 #~ "\n"
 #~ "Podświedlanie błędów w pisowni nie będzie używane"
-
 #~ msgid "Every %s _minutes"
 #~ msgstr "Co %s _minut"
-
 #~ msgid "You must enter a password for the new account."
 #~ msgstr "Musisz wpisać hasło dla nowego konta."
-
 #~ msgid "Blocked Contacts for %s"
 #~ msgstr "Kontakty zablokowane (dla %s)"
-
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "%s nie wygląda na poprawny JID"
-
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Usuń %s z grupy %s"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Ukrywa przyciski podczas rozmowy dwóch osób."
-
 #~ msgid "Security error connecting to \"%s\""
 #~ msgstr "Błąd zabezpieczeń przy połączeniu z \"%s\""
-
 #~ msgid ""
 #~ "The server's key has changed, or someone is trying to hack your "
 #~ "connection."
 #~ msgstr ""
 #~ "Zmienił się klucz twojego serwera lub ktoś próbuje podsłuchać połączenie."
-
 #~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
 #~ msgstr ""
 #~ "Nie można sprawdzić odcisku klucza %s. Połączenie może nie być bezpieczne"
-
 #~ msgid "Missing fingerprint in SSL connection to %s"
 #~ msgstr "Brak odcisku klucza w połączeniu SSL z %s"
-
 #~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
 #~ msgstr "Niezgodność odcisku klucza %s. Oczekiwano %s, otrzymano %s"
-
 #~ msgid " %d unread single message"
 #~ msgid_plural " %d unread single messages"
 #~ msgstr[0] "%d nieprzeczytana wiadomość"
 #~ msgstr[1] "%d nieprzeczytane wiadomości"
 #~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
-
 #~ msgid " %d unread group chat message"
 #~ msgid_plural " %d unread group chat messages"
 #~ msgstr[0] "%d nieprzeczytana wiadomość z czatu"
 #~ msgstr[1] "%d nieprzeczytane wiadomości z czatu"
 #~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
-
 #~ msgid " %d unread private message"
 #~ msgid_plural " %d unread private messages"
 #~ msgstr[0] "%d nieprzeczytana wiadomość prywatna"
 #~ msgstr[1] "%d nieprzeczytane wiadomości prywatne"
 #~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
-
 #~ msgid "gtk+"
 #~ msgstr "gtk+"
-
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
-
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo i Julia</small>"
-
 #~ msgid "Old stories"
 #~ msgstr "Stare historie"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Monolog"
-
 #~ msgid "Private Chat"
 #~ msgstr "Rozmowa prywatna"
-
 #~ msgid "Group Chat"
 #~ msgstr "Pokój"
-
 #~ msgid "I'm %s"
 #~ msgstr "Jestem %s"
-
 #~ msgid "A_fter nickname:"
 #~ msgstr "_Za pseudonimem:"
-
-#~ msgid "B_efore nickname:"
-#~ msgstr "_Przed pseudonimem:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Po czasie:"
-
 #~ msgid "_Before time:"
 #~ msgstr "P_rzed czasem:"
-
 #~ msgid "_Retrieve"
 #~ msgstr "_Przywróć"
-
 #~ msgid "Information published"
 #~ msgstr "Informacja została opublikowana"
-
 #~ msgid "Without a connection, you can not get your contact information."
 #~ msgstr "Musisz być połączony by uzyskać informacje o kontakcie."
-
 #~ msgid "This is result of query."
 #~ msgstr "Oto wynik zapytania."
-
 #~ msgid "Edit items on the list"
 #~ msgstr "Edytuj obiekty na liście"
-
 #~ msgid "Receive a Message"
 #~ msgstr "Odbierz wiadomość"
-
 #~ msgid "JID: "
 #~ msgstr "JID: "
-
 #~ msgid "Merge consecutive nickname in chat window."
 #~ msgstr "Łącz następujące po sobie te same nicki w oknie czata."
-
 #~ msgid "Role: "
 #~ msgstr "Funkcja: "
-
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
@@ -10770,48 +10132,35 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Dźwięk, który zostanie odtworzony, gdy nadejdzie wiadomość MUC. (Ta opcja "
 #~ "jest brana pod uwagę jedynie gdy zmienna notify_on_all_muc_messages ma "
 #~ "wartość True)"
-
 #~ msgid "Away "
 #~ msgstr "Zaraz wracam "
-
 #~ msgid "Down"
 #~ msgstr "W dół"
-
 #~ msgid "List of special notifications settings"
 #~ msgstr "Lista akcji dla powiadomień"
-
 #~ msgid "Not Available "
 #~ msgstr "Nieobecny "
-
 #~ msgid "Up"
 #~ msgstr "Do góry"
-
 #~ msgid "Create your own Privacy Lists"
 #~ msgstr "Stwórz własną listę prywatności"
-
 #~ msgid "Server-based Privacy Lists"
 #~ msgstr "Listy prywatności po stronie serwera"
-
 #~ msgid "Contact _Info"
 #~ msgstr "_Informacje o kontakcie"
-
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
-
 #~ msgid "Invalid room or server name"
 #~ msgstr "Niepoprawna nazwa pokoju lub serwera"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Informacje o tobie zostały opublikowane."
-
 #~ msgid "Migrating Logs..."
 #~ msgstr "Przenoszenie logów..."
-
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d nieprzeczytana wiadomość"
 #~ msgstr[1] "Gajim - %d nieprzeczytane wiadomości"
 #~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
-
 #~ msgid "Since %s"
 #~ msgstr "Od %s"
+
diff --git a/po/pt.po b/po/pt.po
index fda6700d6..1ebca3cc1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -288,9 +288,9 @@ msgstr "Editar Detalhes Pessoais..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -299,9 +299,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Geral"
 
@@ -359,21 +359,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informações sobre si, tal como estão gravadas no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Nenhum"
 
@@ -532,8 +532,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -549,7 +549,7 @@ msgid "Mer_ge accounts"
 msgstr "_Fundir contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Re_nomear"
 
@@ -972,7 +972,7 @@ msgstr "Nome:"
 msgid "New entry received"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
@@ -1021,12 +1021,12 @@ msgstr "Introduza a nova senha:"
 msgid "<b>Type your new status message</b>"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "Activo"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "Sala:"
@@ -1124,8 +1124,8 @@ msgstr "Editar _Grupos"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr ""
 
@@ -1140,8 +1140,8 @@ msgid "Remo_ve"
 msgstr "_Remover"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Pedir para ver o estado dele/dela"
@@ -1179,8 +1179,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1192,7 +1192,7 @@ msgstr "Proibí-lo /-la de ver o meu estado"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1215,8 +1215,8 @@ msgid "_Subscription"
 msgstr "_Subscrição"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
@@ -1316,7 +1316,7 @@ msgstr ""
 "Quando uma transferência de ficheiro é concluida, exibir um popup de "
 "notificação"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1324,7 +1324,7 @@ msgstr "_Continuar"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Abrir Pasta"
 
@@ -1353,7 +1353,7 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Negrito"
 
@@ -1374,12 +1374,12 @@ msgstr "Personalização de Temas do Gajim"
 msgid "Gone"
 msgstr "Nenhum"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 #, fuzzy
 msgid "Inactive"
 msgstr "Activo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Itálico"
 
@@ -1427,7 +1427,7 @@ msgstr "Muda A_ssunto"
 msgid "Configure _Room..."
 msgstr "Configurar _Sala"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Adicionar esta Sala aos _Bookmarks"
@@ -1516,8 +1516,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 #, fuzzy
 msgid "Delete"
 msgstr "Apagar MOTD"
@@ -1544,7 +1545,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Pesquisar"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Histórico das Conversas"
 
@@ -1570,7 +1571,7 @@ msgstr "_Histórico das Conversas"
 msgid "Bookmark this room"
 msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
@@ -1598,8 +1599,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1628,7 +1629,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Mostrar hora:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -1751,17 +1752,26 @@ msgid "Show a list of formattings"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Clique para inserir um emoticon (Alt+E)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "E_nviar"
 
@@ -1904,6 +1914,16 @@ msgid "Configure color and font of the interface"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Mensagem de estado:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Nome do Contacto"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1912,36 +1932,36 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1951,7 +1971,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1961,7 +1981,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1969,37 +1989,37 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se desligarem"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -2008,7 +2028,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -2017,7 +2037,7 @@ msgstr ""
 "Se marcado, Gajim exibirá as mensagens de estado dos contactos debaixo dos "
 "nomes de cada um na janela principal"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2025,7 +2045,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2033,7 +2053,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2041,14 +2061,14 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2059,20 +2079,20 @@ msgstr ""
 "spammar/incomodar. Use com precaução, pois isto bloqueia todas as mensagens "
 "de qualquer contacto que não estiver na sua lista."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2082,13 +2102,13 @@ msgstr ""
 "(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
 "disponível, ausente, ocupado, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -2097,110 +2117,110 @@ msgstr ""
 "Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
 "gráficos equivalentes."
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gerir..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificação da Conta"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Iconset de _estados padrão:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "Style"
 msgstr "Interrompida"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2208,7 +2228,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2216,118 +2236,118 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Usar iconsets de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Introduza a sua mensagem :"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Antes da alcunha:"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "Marcar automaticamente como _ausente depois de:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Gerir Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar eventos de contactos que não estão na lista"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:110
-#, fuzzy
-msgid "_Incoming message:"
-msgstr "Mensagem recebida:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Marcar automaticamente como _indisponível depois de:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:115
-#, fuzzy
-msgid "_Outgoing message:"
-msgstr "Mensagem a enviar:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Voltar às Cores Padrão"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "_Entrar num Chat"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "Fora da lista"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minutos"
 
@@ -2385,7 +2405,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr ""
 
@@ -2550,7 +2570,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Propriedades</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Registos</b>"
@@ -2615,8 +2635,8 @@ msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -2635,14 +2655,15 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
 msgid "gtk-cancel"
 msgstr "Apagar MOTD"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-ok"
-msgstr ""
-
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2704,7 +2725,7 @@ msgstr "_Acções"
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -2752,12 +2773,12 @@ msgid "_Add contact"
 msgstr "Adicionar _Contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 #, fuzzy
 msgid "_Information"
 msgstr "Informações do Contacto"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Pesquisar"
 
@@ -2777,10 +2798,6 @@ msgstr "Registar para"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -3005,340 +3022,324 @@ msgstr "Recurso:"
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informações do Contacto"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Activated"
 msgstr "Activo"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Deactivated"
 msgstr "Activo"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 #, fuzzy
 msgid "Integer"
 msgstr "Neste grupo"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Nome Preferencial"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Escondida"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr ""
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] ""
+msgstr[1] ""
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "German"
 msgstr "Geral"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Greek"
 msgstr "green"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Croatian"
 msgstr "Morada"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Italian"
 msgstr "Itálico"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Polish"
 msgstr "_Publicar"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Serbian"
 msgstr "Geral"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "Sublinhar"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Serviço"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "Letra:"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informações do Contacto"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Encriptação activada"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-#, fuzzy
-msgid "Unknown Artist"
-msgstr "Tipo desconhecido %s"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-#, fuzzy
-msgid "Unknown Title"
-msgstr "Tipo desconhecido %s"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-#, fuzzy
-msgid "Unknown Source"
-msgstr "Tipo desconhecido %s"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar autenticação"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar autenticação"
@@ -3346,58 +3347,58 @@ msgstr "Usar autenticação"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3405,22 +3406,22 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
@@ -3429,23 +3430,23 @@ msgstr "%(nick)s está agora %(status)s"
 msgid "creating logs database"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é um ficheiro, mas deveria ser um directório"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim irá agora sair"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é um directório, mas deveria ser um ficheiro"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "a criar directório %s"
@@ -3515,10 +3516,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 #, fuzzy
 msgid "Groupchats"
 msgstr "Chat"
@@ -3631,9 +3632,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 #, fuzzy
 msgid "default"
 msgstr "Apagar MOTD"
@@ -4207,136 +4208,136 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4345,108 +4346,107 @@ msgstr ""
 "Som a tocar quando uma mensagem de chat conter uma das palavras da lista "
 "muc_highlight_words, or quando uma mensagem conter a sua alcunha."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 #, fuzzy
 msgid "Wrong host"
 msgstr "Frase de acesso"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informação de registo para o transport %s não chegou a tempo"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Publicação vCard deu-se com sucesso"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alcunha não encontrada: %s"
@@ -4454,79 +4454,79 @@ msgstr "Alcunha não encontrada: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Está banido/a desta sala."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Criação de salas encontra-se restrita."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "A sua alcunha registada tem de ser usada."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Não está na lista de membros."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorização foi removida"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "pedido de remoção de subscrição por %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "já não estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4666,189 +4666,186 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Não é possível enviar ficheiros vazios"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Esta mensagem é encriptada]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Assunto: %s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Senha Inválida"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Ligação"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se o seu login e senha estão correctos."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "erro ao enviar"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Não é possível enviar ficheiros vazios"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Esta mensagem é encriptada]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Assunto: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contacto:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 #, fuzzy
 msgid "Not in roster"
 msgstr "Fora da lista"
@@ -5105,7 +5102,7 @@ msgstr "Livre para conversar"
 msgid "_Available"
 msgstr "_Disponível"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Disponível"
 
@@ -5227,77 +5224,77 @@ msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar mensagem"
 msgstr[1] "Enviar mensagem"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5313,16 +5310,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "a criar base de dados dos logs"
@@ -5332,699 +5329,721 @@ msgstr "a criar base de dados dos logs"
 msgid "XMPP account %s@%s"
 msgstr "para conta %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "Pausada"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "Negrito"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "Conversa"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "Negrito"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "_Conteúdo"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completa"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "_Conteúdo"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "Activo"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 #, fuzzy
 msgid "Curious"
 msgstr "_Anterior"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "Apagar MOTD"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr ""
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Envious"
 msgstr "_Anterior"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "mensagem"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisível"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "Nenhum"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "Geral"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "_Modificar"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 #, fuzzy
 msgid "Nervous"
 msgstr "_Anterior"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "Offline"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "Apagar MOTD"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "Interrompida"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "Nome:"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Serious"
 msgstr "_Anterior"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "_Expulsar"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "A dormir"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "Rua:"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "Subscrição"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "Sublinhar"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Frase de acesso"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "Evento"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Neste grupo"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Evento"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "Expulsando %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entrar"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "A comer"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "Mudar Assunto"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "Expulsando %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "A comer"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 #, fuzzy
 msgid "Relaxing"
 msgstr "simples"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "Expulsando %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "A comer"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "_Desligar"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "A comer"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "A comer"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr ""
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "A dormir"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "A comer"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Estou a ver um filme."
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "A comer"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "Estou ao telefone."
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "A transferir"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "Ligando"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "Ligação"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "A trabalhar"
 
+#: ../src/common/pep.py:335
+#, fuzzy
+msgid "Unknown Artist"
+msgstr "Tipo desconhecido %s"
+
+#: ../src/common/pep.py:338
+#, fuzzy
+msgid "Unknown Title"
+msgstr "Tipo desconhecido %s"
+
+#: ../src/common/pep.py:341
+#, fuzzy
+msgid "Unknown Source"
+msgstr "Tipo desconhecido %s"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, fuzzy, python-format
@@ -6044,87 +6063,56 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Palavra-chave do OpenPGP não foi recebida"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "O utilizador será ligado a %s sem OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Para continuar a enviar e receber mensagens, precisará de se reconectar."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Esta mensagem é encriptada]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6135,291 +6123,291 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "erro ao enviar"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 #, fuzzy
 msgid "Rename Account"
 msgstr "Gerir Contas"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sem ligação, não lhe é possível editar as suas informações pessoais."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6429,62 +6417,63 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6492,31 +6481,31 @@ msgstr ""
 "bookmark"
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 #, fuzzy
 msgid "Invalid server"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6527,34 +6516,34 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6564,7 +6553,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6572,77 +6561,77 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6651,235 +6640,232 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde que prestou atenção a este "
 "chat pela última vez."
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Sair"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta um \"%s\" no URL do Dicionário e como tal não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Ontem"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "Há %i dias atrás"
+msgid_plural "%i days ago"
+msgstr[0] "Ontem"
+msgstr[1] "Ontem"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de IM Jabber"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contacto <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Nome do Contacto"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir MOTD"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Complemento:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor preencha os dados do contacto que deseja adicionar na conta %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6888,104 +6874,107 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Pedido de subscrição para a conta %s por parte de %s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Já está na sala %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nome de conta inválido"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr ""
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6995,312 +6984,341 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível escrever ficheiro em %s"
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "Consola XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Interrompida"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "_Modificar"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Remover"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 #, fuzzy
 msgid "Add"
 msgstr "Endereço"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Adicionar _Contacto"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Remove o contacto da lista"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Descrição: %s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está banido/a desta sala."
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 #, fuzzy
 msgid "Condition"
 msgstr "Ligação"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7308,38 +7326,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7349,31 +7367,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Outros"
@@ -7383,24 +7420,24 @@ msgstr "Outros"
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7408,341 +7445,336 @@ msgstr ""
 "Não há serviço/recurso no endereço que introduziu, ou pelo menos não "
 "responde. Verifique o endereço e tente novamente."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço/recurso não contém itens para explorar."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "usando a conta %s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 #, fuzzy
 msgid "_Execute Command"
 msgstr "comando"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Bookmark já está configurado"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos seus bookmarks."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Pode gerir os seus bookmarks pelo menu de Acções na sua janela."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscrição"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Comandos: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Mensagem recebida:"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "_Histórico"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "Mensagem"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "As senhas não conferem"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Modificação da Conta"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Mensagem recebida:"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "Geral"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "Recursos dos Servidores"
@@ -7759,142 +7791,142 @@ msgstr "Tempo"
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Transferência de ficheiro completa"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Transferência de ficheiro cancelada"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Ligação ao peer não pode ser estabelecida."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Escolher Ficheiro para Enviar"
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim não consegue aceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Este ficheiro está a ser usado por outro processo."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 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:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Guardar Ficheiro como..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7902,32 +7934,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Ficheiro Inválido"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pausa"
 
@@ -8001,447 +8033,40 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Frase de acesso Necessária"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Introduza a chave GPG para a conta %s"
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "O utilizador será ligado a %s sem OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-#, fuzzy
-msgid "Wrong Passphrase"
-msgstr "Frase de acesso"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr ""
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
-"Por favor, introduza outra alcunha em baixo:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Aceita este pedido?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Aceita este pedido?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) Autorização para %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-#, fuzzy
-msgid "Connection Failed"
-msgstr "Ligação"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Introduza a sua mensagem :"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "erro ao enviar"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Pedido de Subscrição"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorização aceite"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Contacto \"%s\" removeu a sua subscrição para si"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Subscrever"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Contacto com \"%s\" não pode ser estabelecido"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s agora é conhecido como %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s está agora %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "É necessária uma palavra-passe para esta sala."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Está neste momento ligado sem a sua chave OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "A sua chave de acesso está incorrecta"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "A sua chave de acesso está incorrecta"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-#, fuzzy
-msgid "Do _not ask me again"
-msgstr "_Não voltar a perguntar"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1683
-#, fuzzy, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Tem mensagens não lidas"
-msgstr[1] "Tem mensagens não lidas"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s quer enviar-lhe um ficheiro."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Remove o contacto da lista"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Erro na leitura do ficheiro:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Recebeu com sucesso %(filename)s de %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Transferência de %(filename)s de %(name)s interrompida."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Enviou com sucesso %(filename)s para %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Transferência de %(filename)s para %(name)s interrompida."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "Em todas as _mensagens"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr ""
-
-#: ../src/gajim.py:2043
-#, fuzzy
-msgid "Please type a new username for your local account"
-msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-#, fuzzy
-msgid "Error."
-msgstr "Erro:"
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "Recurso: "
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Ligação"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Encriptação desactivada"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-#, fuzzy
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Não pode entrar numa sala quando está invisível"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Impossível salvar as suas definições e preferências"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "Exibe ajuda acerca de um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "mostrar ajuda sobre comando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Abre uma janela com a próxima mensagem não lida"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8450,51 +8075,51 @@ msgstr ""
 "Mostra uma lista de todos os contactos na lista. Cada contacto aparece numa "
 "linha separada"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "mostrar apenas contactos da conta indicada"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Mostra uma lista de contas registadas"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "mensagem"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "mensagem de estado:"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8503,22 +8128,22 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "_Prioridade"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quero _registar uma nova conta"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8528,25 +8153,25 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostra uma caixa de conversa para que possa enviar mensagens a um contacto"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto com quem deseja conversar"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se especificado, o contacto é escolhido da lista de contactos desta conta"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8557,29 +8182,29 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se especificado, a mensagem será encriptada usando esta chave pública"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8590,119 +8215,119 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 #, fuzzy
 msgid "subject"
 msgstr "Assunto:"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "Ficheiro"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chave' é o nome da preferência, 'valor' é o valor da qual se pretende "
 "definir"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escreve o estado actual das preferências do Gajim para o ficheiro .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Adiciona o contacto à lista"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Adiciona um novo contacto nesta conta."
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -8710,109 +8335,109 @@ msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 #, fuzzy
 msgid "XML to send"
 msgstr "Consola XML"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Juntar-se a uma Nova Sala"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "nick"
 msgstr "_Expulsar"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "password"
 msgstr "Senha:"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "As senhas não conferem"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8821,31 +8446,31 @@ msgstr ""
 "'%s' não está na sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem"
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8854,7 +8479,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8863,7 +8488,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8872,7 +8497,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Frase de acesso"
@@ -8903,176 +8528,201 @@ msgstr "Não pode apagar o seu tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Já não se encontra na sala \"%s\" ou \"%s\" saiu."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "Histórico das Conversas"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Ligação"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s agora é conhecido como %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Filiação: "
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se fechar esta janela, perder-se-á a ligação a esta sala."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#, fuzzy
+msgid "Do _not ask me again"
+msgstr "_Não voltar a perguntar"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrição: %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -9098,61 +8748,453 @@ msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Erro na interpretação (parsing) do ficheiro:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Impossível escrever para %s. Session Management não será suportado"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - Um cliente Jabber GTK+"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Deseja sobre-escrevê-lo?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
+"Por favor, introduza outra alcunha em baixo:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Aceita este pedido?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Aceita este pedido?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Autorização para %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Ligação"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Introduza a sua mensagem :"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "erro ao enviar"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Pedido de Subscrição"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorização aceite"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Contacto \"%s\" removeu a sua subscrição para si"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Subscrever"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Contacto com \"%s\" não pode ser estabelecido"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "É necessária uma palavra-passe para esta sala."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Está neste momento ligado sem a sua chave OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "A sua chave de acesso está incorrecta"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "A sua chave de acesso está incorrecta"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1294
+#, fuzzy, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Tem mensagens não lidas"
+msgstr[1] "Tem mensagens não lidas"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s quer enviar-lhe um ficheiro."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Remove o contacto da lista"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Erro na leitura do ficheiro:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Recebeu com sucesso %(filename)s de %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Transferência de %(filename)s de %(name)s interrompida."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Enviou com sucesso %(filename)s para %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Transferência de %(filename)s para %(name)s interrompida."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Em todas as _mensagens"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:1658
+#, fuzzy
+msgid "Please type a new username for your local account"
+msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+#, fuzzy
+msgid "Error."
+msgstr "Erro:"
+
+#: ../src/gui_interface.py:1721
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Recurso: "
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s quer enviar-lhe um ficheiro."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Pedido de Transferência de Ficheiro"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Ligação"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Encriptação desactivada"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Não pode entrar numa sala quando está invisível"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Impossível salvar as suas definições e preferências"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Frase de acesso Necessária"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Introduza a chave GPG para a conta %s"
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "O utilizador será ligado a %s sem OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+#, fuzzy
+msgid "Wrong Passphrase"
+msgstr "Frase de acesso"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr ""
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Chat"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de o adicionar à minha lista"
 
@@ -9169,7 +9211,7 @@ msgstr "Contacto:"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Data:"
 
@@ -9181,7 +9223,7 @@ msgstr "Alcunha:"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Mensagem"
 
@@ -9200,202 +9242,202 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] ""
 msgstr[1] ""
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversas com %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 #, fuzzy
 msgid "Disk Error"
 msgstr "Erro:"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 #, fuzzy
 msgid "Error"
 msgstr "Erro:"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr ""
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contacto Saiu"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Instantânea"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, fuzzy, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "_Continuar"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 #, fuzzy
 msgid "File is empty"
 msgstr "Localização do ficheiro"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tal sala não existe."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 #, fuzzy
 msgid "Information received"
 msgstr "Convite Recebido"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "É necessária uma ligação para poder publicar as suas informações de contacto."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9403,46 +9445,51 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar este pedido, você passará a saber o seu estado."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "O utilizador será ligado a %s sem OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9450,28 +9497,28 @@ msgstr ""
 "Mudar o seu estado para invisível fará com que seja desligado desses chats. "
 "De certeza que deseja tornar-se invisível?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Tem a certeza de que deseja sair das salas \"%s\"?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9479,16 +9526,16 @@ msgid ""
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9497,12 +9544,12 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9511,72 +9558,72 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Contacto:"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Remover"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9586,12 +9633,12 @@ msgstr ""
 "sempre como offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9599,17 +9646,17 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto saiba o meu estado depois da remoção"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9618,68 +9665,68 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ficheiro Inválido"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s quer enviar-lhe um ficheiro:"
 msgstr[1] "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
@@ -9689,169 +9736,169 @@ msgstr "Envia um ficheiro a um contacto"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gerir Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descobrir Recursos..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Nova Mensagem"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilizadores _Online"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Contacto:"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 #, fuzzy
 msgid "Send Single Message"
 msgstr "E_nviar Mensagem Simples"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transportes"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto Entrou"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto Entrou"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Entrar num Chat"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Assunto: %s\n"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9861,7 +9908,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9871,120 +9918,120 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Versão %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "Ligação"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto Entrou"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Subscrição:"
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Parada"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Completa"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço/recurso ainda não respondeu com informações detalhadas"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9992,30 +10039,30 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10023,7 +10070,7 @@ msgstr ""
 "Este contacto está interessado/a na suas informações de presença, mas você "
 "não está interessado na dele/a"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10031,31 +10078,53 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Você e o contacto estão interessados nas informações de presença um do outro"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Não está interessado na presença do contacto, nem ele/ela está na sua"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Está à espera da resposta do contacto sobre o seu pedido de subscrição"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
 #, fuzzy
+#~ msgid "_Incoming message:"
+#~ msgstr "Mensagem recebida:"
+
+#, fuzzy
+#~ msgid "_Outgoing message:"
+#~ msgstr "Mensagem a enviar:"
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Palavra-chave do OpenPGP não foi recebida"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Para continuar a enviar e receber mensagens, precisará de se reconectar."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Esta mensagem é encriptada]"
+
+#~ msgid "%i days ago"
+#~ msgstr "Há %i dias atrás"
+
+#, fuzzy
 #~ msgid "Add Special _Notification"
 #~ msgstr "<b>Notificações Visuais</b>"
 
@@ -10314,10 +10383,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Also known as iChat style"
 #~ msgstr "Conhecido também como estilo iChat"
 
-#, fuzzy
-#~ msgid "B_efore nickname:"
-#~ msgstr "Antes da alcunha:"
-
 #~ msgid "Chat"
 #~ msgstr "Conversa"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d766541d9..8da537eae 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,26 +2,26 @@
 # Portuguese translations for Gajim package.
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim package.
-#
 # junix <junix@targetlinux.org>, 2005.
 # Gajim <gajim-devel@gajim.org>, 2007.
-# Djavan Fagundes <dnoway@gmail.com>, 2009.
+# Djavan Fagundes <djavan@comum.org>, 2009, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-09-23 09:56-0300\n"
+"POT-Creation-Date: 2010-01-10 10:13+0100\n"
+"PO-Revision-Date: 2009-12-31 23:22-0300\n"
 "Last-Translator: Djavan Fagundes <dnoway@gmail.com>\n"
-"Language-Team: Português Brasileiro <gajim-devel@gajim.org>\n"
+"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 0.5.0\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
@@ -110,9 +110,8 @@ msgstr ""
 "SHA1 fingerprint do certificado:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Usar aut_enticação de proxy"
+msgstr "Autenticação anôn_ima"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -134,7 +133,7 @@ msgstr "Eu quero _registrar uma nova conta"
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
-msgstr "Se marcado, o Gajim lembrará a senha para esta conta"
+msgstr "Se marcado, o Gajim irá memorizar a senha para esta conta"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
@@ -203,7 +202,7 @@ msgstr "_Servidor:"
 
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
@@ -287,9 +286,9 @@ msgstr "Editar detalhes pessoais..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1156
+#: ../src/common/helpers.py:1168 ../src/notify.py:553 ../src/notify.py:574
+#: ../src/notify.py:612 ../src/notify.py:624
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -298,9 +297,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:61 ../src/common/contacts.py:141
+#: ../src/dialogs.py:110 ../src/dialogs.py:120 ../src/roster_window.py:2763
+#: ../src/roster_window.py:5252
 msgid "General"
 msgstr "Geral"
 
@@ -314,7 +313,7 @@ msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
 msgstr ""
-"Se marcado, o Gajim transmitirá também alguns outros IP's exceto o seu, "
+"Se marcado, o Gajim irá transmitir também alguns outros IP's exceto o seu, "
 "então a transferência de arquivo tem grandes possibilidades de executar "
 "corretamente."
 
@@ -324,7 +323,7 @@ msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
 msgstr ""
-"Se marcado, o Gajim enviará pacotes keep-alive para prevenir timeout na "
+"Se marcado, o Gajim irá enviar pacotes keep-alive para prevenir timeout na "
 "conexão, evitando-a cair"
 
 #: ../data/glade/account_modification_window.glade.h:22
@@ -332,7 +331,7 @@ msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
 msgstr ""
-"Se checado, o Gajim gravará sua senha em ~/.gajim/config com permissão de "
+"Se checado, o Gajim irá gravar sua senha em ~/.gajim/config com permissão de "
 "'leitura' somente para você"
 
 #: ../data/glade/account_modification_window.glade.h:23
@@ -341,8 +340,8 @@ msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
-"Se marcado, o Gajim, quando carregado, conectará automaticamente ao jabber "
-"usando esta conta"
+"Se marcado, o Gajim, quando carregado, irá conectar automaticamente ao "
+"jabber usando esta conta"
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
@@ -360,21 +359,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informações sobre você são gravadas no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1740
+#: ../src/config.py:2290
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1253
+#: ../src/config.py:1356 ../src/config.py:1644 ../src/config.py:1649
+#: ../src/config.py:2197 ../src/config.py:2276 ../src/config.py:2289
+#: ../src/config.py:3492 ../src/config.py:3565 ../src/dialogs.py:307
+#: ../src/dialogs.py:309 ../src/dialogs.py:512 ../src/dialogs.py:525
+#: ../src/roster_window.py:2817 ../src/roster_window.py:2823
+#: ../src/roster_window.py:2828
 msgid "None"
 msgstr "Nenhum"
 
@@ -488,9 +487,8 @@ msgid "Accounts"
 msgstr "Contas"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Usar aut_enticação de proxy"
+msgstr "Autenticação anônima"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -529,8 +527,8 @@ msgstr ""
 "Considere a possível modificação das regras do seu firewall."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1767
+#: ../src/dialogs.py:829
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -544,7 +542,7 @@ msgid "Mer_ge accounts"
 msgstr "Mes_clar contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5207
 msgid "Re_name"
 msgstr "Re_nomear"
 
@@ -748,7 +746,7 @@ msgstr "Configurar mensagem do dia"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
-msgstr "Mostrar console _XML"
+msgstr "Exibir console _XML"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:8
 msgid "Update MOTD..."
@@ -779,7 +777,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Condições</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/glade/preferences_window.glade.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
@@ -796,7 +794,7 @@ msgid "All statuses"
 msgstr "Totos os status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../src/common/commands.py:106 ../src/common/helpers.py:231
 msgid "Away"
 msgstr "Afastado"
 
@@ -813,7 +811,7 @@ msgid "Have "
 msgstr "Possui "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:241
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -822,7 +820,7 @@ msgid "Launch a command"
 msgstr "Executar um comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:214
 msgid "Not Available"
 msgstr "Não disponível"
 
@@ -903,7 +901,7 @@ msgstr "Mo_strar somente na lista"
 
 #: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in systray"
-msgstr "_Mostrar evento na bandeja do sistema"
+msgstr "_Exibir evento na bandeja do sistema"
 
 #: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
@@ -943,7 +941,7 @@ msgstr "Modificado:"
 msgid "New entry received"
 msgstr "Novo evento recebido"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Você recebeu uma nova entrada:"
 
@@ -987,11 +985,11 @@ msgstr "Digite sua nova senha:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Digite sua nova mensagem de status:</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Atividade:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Humor:"
 
@@ -1071,9 +1069,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Atribuir chave Open_PGP..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Executar comando..."
+msgstr "E_xecutar comando..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1081,8 +1078,8 @@ msgstr "Editar _grupos..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5162
+#: ../src/roster_window.py:5317
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
@@ -1095,8 +1092,8 @@ msgid "Remo_ve"
 msgstr "Remo_ver"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5172
+#: ../src/roster_window.py:5404
 msgid "Send Cus_tom Status"
 msgstr "Enviar status perso_nalizado"
 
@@ -1129,8 +1126,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Permitir que ele/ela veja meu status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5231
+#: ../src/roster_window.py:5354 ../src/roster_window.py:5481
 msgid "_Block"
 msgstr "_Bloquear"
 
@@ -1141,7 +1138,7 @@ msgstr "_Proibir ele/ela de ver meu status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5550
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1162,8 +1159,8 @@ msgid "_Subscription"
 msgstr "_Inscrição"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5225
+#: ../src/roster_window.py:5348 ../src/roster_window.py:5478
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
@@ -1240,7 +1237,7 @@ msgstr ""
 
 #: ../data/glade/filetransfers.glade.h:10
 msgid "Shows a list of file transfers between you and others"
-msgstr "Mostrar uma lista de transferências de arquivos entre você e os outros"
+msgstr "Exibe uma lista de transferências de arquivos entre você e os outros"
 
 #: ../data/glade/filetransfers.glade.h:11
 msgid ""
@@ -1252,9 +1249,9 @@ msgstr ""
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
-msgstr "Mostrar um alerta visual quanto uma transferência de arquivo terminar"
+msgstr "Exibir um alerta visual quanto uma transferência de arquivo terminar"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:788
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1262,7 +1259,7 @@ msgstr "_Continuar"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:205
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta do arquivo"
 
@@ -1290,7 +1287,7 @@ msgstr ""
 "Linha contato\n"
 "Banner de conversa"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Negrito"
 
@@ -1310,11 +1307,11 @@ msgstr "Customização de temas do Gajim"
 msgid "Gone"
 msgstr "Enviado"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inativo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Itálico"
 
@@ -1362,7 +1359,7 @@ msgstr "Alterar as_sunto..."
 msgid "Configure _Room..."
 msgstr "Configurar _sala..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1745
 msgid "_Bookmark"
 msgstr "Ma_rcadores"
 
@@ -1426,13 +1423,13 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Criar nova postagem"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:256
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Assunto"
 
@@ -1451,8 +1448,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gerenciador de histórico de conversas do Gajim</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3056
+#: ../src/dialogs.py:3153
 msgid "Delete"
 msgstr "Deletar"
 
@@ -1482,7 +1480,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Buscar no banco de dados"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Histórico de conversação"
 
@@ -1493,7 +1491,7 @@ msgid ""
 "All Chat Histories"
 msgstr ""
 "Digite o JID ou o nome do contato\n"
-"Históricos de conferências\n"
+"Históricos das salas\n"
 "Todos os históricos de conversa"
 
 #: ../data/glade/history_window.glade.h:5
@@ -1506,11 +1504,10 @@ msgid "_Log conversation history"
 msgstr "_Histórico de conversação"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "Adicionar esta sala aos marcadores (Ctrl+B)"
+msgstr "Adicionar esta sala aos marcadores"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2074
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
@@ -1537,8 +1534,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1305
+#: ../src/disco.py:1749
 msgid "_Join"
 msgstr "_Ingressar"
 
@@ -1567,7 +1564,7 @@ msgstr "Minimizar ao entrar automaticamente"
 msgid "Print status:"
 msgstr "Imprimir status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1757
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -1641,54 +1638,120 @@ msgstr "_Tipo:"
 msgid "_Username:"
 msgstr "Nome de _usuário:"
 
-#: ../data/glade/message_window.glade.h:1
+#. # means number
+#: ../data/glade/message_window.glade.h:1 ../src/dialogs.py:3988
+msgid "#"
+msgstr "#"
+
+#: ../data/glade/message_window.glade.h:2
+msgid "*"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:3
+#: ../data/glade/single_message_window.glade.h:1
+msgid "0"
+msgstr "0"
+
+#: ../data/glade/message_window.glade.h:4
+msgid "1"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:13
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Adicionar este contato para a lista (Ctrl+D)"
 
-#: ../data/glade/message_window.glade.h:2
+#: ../data/glade/message_window.glade.h:14
 msgid "Bookmark this room (Ctrl+B)"
 msgstr "Adicionar esta sala aos marcadores (Ctrl+B)"
 
-#: ../data/glade/message_window.glade.h:3
+#: ../data/glade/message_window.glade.h:15
 msgid "Browse the chat history (Ctrl+H)"
 msgstr "Pesquisar o histórico de conversas (Ctrl+H)"
 
-#: ../data/glade/message_window.glade.h:4
+#: ../data/glade/message_window.glade.h:16
 msgid "Change the room's subject (Alt+T)"
 msgstr "Alterar o assunto da sala (Alt+T)"
 
-#: ../data/glade/message_window.glade.h:5
+#: ../data/glade/message_window.glade.h:17
 msgid "Change your nickname (Ctrl+N)"
 msgstr "Alterar o seu apelido (Ctrl+N)"
 
-#: ../data/glade/message_window.glade.h:6
+#: ../data/glade/message_window.glade.h:18
 msgid "Invite contacts to the conversation (Ctrl+G)"
 msgstr "Convidar contatos para a conversa (Ctrl+G)"
 
-#: ../data/glade/message_window.glade.h:7
+#: ../data/glade/message_window.glade.h:19
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:20
 msgid "Send a file (Ctrl+F)"
 msgstr "Enviar um arquivo (Ctrl+F)"
 
-#: ../data/glade/message_window.glade.h:8
+#: ../data/glade/message_window.glade.h:21
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "Exibe uma lista de emoticons (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:9
+#: ../data/glade/message_window.glade.h:22
 msgid "Show a list of formattings"
 msgstr "Exibe uma lista de formatações"
 
-#: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr "Exibir um menu com funções avançadas (Alt+A)"
+#: ../data/glade/message_window.glade.h:23
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Exibir um menu com funções avançadas (Alt+D)"
 
-#: ../data/glade/message_window.glade.h:11
+#: ../data/glade/message_window.glade.h:24
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Exibir o perfil do contato (Ctrl+I)"
 
+#: ../data/glade/message_window.glade.h:25
+msgid "Sound volume:"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:26
+msgid "Toggle audio session"
+msgstr "Alternar sessão de áudio"
+
+#: ../data/glade/message_window.glade.h:27
+msgid "Toggle video session"
+msgstr "Alternar sessão de vídeo"
+
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/message_window.glade.h:13
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../data/glade/message_window.glade.h:29
+#: ../data/glade/xml_console_window.glade.h:17
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1705,67 +1768,86 @@ msgid "<b>Applications</b>"
 msgstr "<b>Aplicações</b>"
 
 #: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Ações</b>"
+
+#: ../data/glade/preferences_window.glade.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Status automático</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Aparência da conversa</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/glade/preferences_window.glade.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Cores da linha da conversa</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/glade/preferences_window.glade.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notificações do estado da conversa</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/glade/preferences_window.glade.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Condições</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Customizar</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Fonte</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opções do GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensagens de status disponíveis</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Privacidade</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Aparência da lista</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Mensagens de status</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Tema</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Nome do meio:</b>"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificações visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:25
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1775,24 +1857,41 @@ msgstr ""
 "Escrevendo somente\n"
 "Desabilitado"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:28
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/glade/preferences_window.glade.h:29
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Permitir o envio de informações do _SO"
+
+#: ../data/glade/preferences_window.glade.h:30
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permite janela/notificação quando eu estou _afastado/ND/ocupado/invisível"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/glade/preferences_window.glade.h:31
 msgid "Allow sound when I'm _busy"
 msgstr "Permitir som quando eu estiver _ocupado"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:32
 msgid "Ask status message when I:"
 msgstr "Solicite uma mensagem de status quanto eu:"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/glade/preferences_window.glade.h:33 ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr "Áudio / Vídeo"
+
+#: ../data/glade/preferences_window.glade.h:34
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:35
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1806,19 +1905,27 @@ msgstr ""
 "Sempre usar aplicações no padrão Xfce\n"
 "Personalizar"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Chat message:"
 msgstr "Mensagem da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Sempre verificar ao iniciar se o Gajim é o cliente Jabber _padrão"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Configure color and font of the interface"
 msgstr "Configurar cores e fontes da interface"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:44
+msgid "Contact's message:"
+msgstr "Mensagem do contato:"
+
+#: ../data/glade/preferences_window.glade.h:45
+msgid "Contact's nickname:"
+msgstr "Apelido do contato:"
+
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1832,31 +1939,36 @@ msgstr ""
 "Lista separada com conversas agrupadas por conta\n"
 "Lista separada com conversas agrupadas por tipo"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Display _activity of contacts in roster"
-msgstr "Mostrar a_tividade dos contatos na lista"
+msgstr "Exibir a_tividade dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:52
 msgid "Display _extra email details"
-msgstr "Mostrar detalhes _extras dos emails"
+msgstr "Exibir detalhes _extras dos emails"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Exibir hum_or dos contatos na lista"
+
+#: ../data/glade/preferences_window.glade.h:54
 msgid "Display _tunes of contacts in roster"
-msgstr "Mostrar sin_tonia dos contatos na lista"
+msgstr "Exibir sin_tonia dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:55
 msgid "Display a_vatars of contacts in roster"
-msgstr "Mostrar a_vatar dos contatos na lista"
+msgstr "Exibir a_vatar dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:56
 msgid "Display m_ood of contacts in roster"
-msgstr "Mostrar hum_or dos contatos na lista"
+msgstr "Exibir hum_or dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Display status _messages of contacts in roster"
-msgstr "Mostrar _mensagem de status da lista de contato"
+msgstr "Exibir _mensagem de status da lista de contato"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:58
 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 "
@@ -1866,7 +1978,7 @@ msgstr ""
 "que você pode ter com um contato. Aqui você pode especificar quais "
 "caracteres você quer para enviar a outra parte."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:59
 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 "
@@ -1876,7 +1988,7 @@ msgstr ""
 "você pode ter com um contato. Aqui você pode especificar quais caracteres "
 "você quer para enviar a outra parte."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1884,11 +1996,11 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se desconectaram"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Esconder todos os botões nas janelas de conversa"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1896,7 +2008,7 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1904,14 +2016,14 @@ msgstr ""
 "Se marcado, o Gajim também incluirá informação sobre o remetente de novos "
 "emails"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Se marcado, o Gajim irá alterar o status para Ausente quando o computador "
 "não estiver em uso."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1919,15 +2031,15 @@ msgstr ""
 "Se marcado, o Gajim irá alterar o status para Não disponível quando o "
 "computador não estiver mais em uso"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr ""
-"Se marcado, Gajim mostrará avatars dos contatos na janela da lista e na "
+"Se marcado, Gajim exibirá avatars dos contatos na janela da lista e na "
 "conferência"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1935,24 +2047,30 @@ msgstr ""
 "Se marcado, Gajim indicará mensagens de status dos contatos sob o nome do "
 "contato na janela da lista e na conferência"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Se marcado, Gajim irá mostrar a atividade dos contatos na janela da lista"
+"Se marcado, Gajim irá exibir a atividade dos contatos na janela da lista"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr "Se marcado, Gajim exibirá o humor dos contatos na janela da lista"
+
+#: ../data/glade/preferences_window.glade.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "Se marcado, Gajim mostrará o humor dos contatos na janela da lista"
+msgstr "Se marcado, Gajim exibirá o humor dos contatos na janela da lista"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Se marcado, o Gajim irá mostrar a sintonia dos contatos na janela da lista"
+"Se marcado, o Gajim irá exibir a sintonia dos contatos na janela da lista"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:73
 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 "
@@ -1963,7 +2081,7 @@ msgstr ""
 "através de um clique com o botão direito no campo de entrada, a linguagem "
 "padrão será usada para este contato ou conferência."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:74
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1973,7 +2091,7 @@ msgstr ""
 "autorizados. Utilize com cuidado, porque isto bloqueia todas as mensagens de "
 "qualquer contato que você não possuir na sua lista"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:75
 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 "
@@ -1983,7 +2101,7 @@ msgstr ""
 "favor, note que quando estiver usando criptografia E2E o remote party não "
 "concorda com o registro, então a mensagem não será gravada."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1991,7 +2109,7 @@ msgstr ""
 "Se marcado, o Gajim irá exibir uma notificação quando um novo email via "
 "GMail for recebido"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:77
 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, "
@@ -2001,7 +2119,7 @@ msgstr ""
 "exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
 "conectado, ausente, ocupado, etc....)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:78
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2009,7 +2127,7 @@ msgstr ""
 "Se habilitado, o Gajim não irá perguntar por mensagem de status. A mensagem "
 "padrão especificada será usada neste caso."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2017,19 +2135,19 @@ msgstr ""
 "Se habilitado, Gajim substituirá o ascii para smilies, como ':)' com a "
 "animação equivalente ou estático emoticons gráfico"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Log _encrypted chat session"
 msgstr "Registrar sessão de conversa _criptografada"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Ma_ke message windows compact"
 msgstr "T_ornar a janela de mensagem compacta"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:82
 msgid "Ma_nage..."
 msgstr "Gere_nciar..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:83
 msgid ""
 "Never\n"
 "Only when pending events\n"
@@ -2039,85 +2157,96 @@ msgstr ""
 "Somente quando houver eventos pendentes\n"
 "Sempre"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Notify me about contacts that sign _in"
 msgstr "Notifique-me sobre contatos ao _conectar"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Notify me about contacts that sign _out"
 msgstr "Notifique-me sobre contatos ao _desconectar"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:89
 msgid "Notify on new _GMail email"
 msgstr "Notificar cada nova mensagem do _GMail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Personal Events"
 msgstr "Eventos pessoais"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Play _sounds"
 msgstr "Tocar _sons"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:92
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
-"Mostrar em um pop-up\n"
+"Exibir em um pop-up\n"
 "Notificar-me sobre isto\n"
 "Mostra apenas na lista"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:95
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:96
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:98
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servidor:"
+
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Show systray:"
-msgstr "Mostrar na bandeja do sistema:"
+msgstr "Exibir na bandeja do sistema:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 "Algumas mensagens podem incluir conteúdo rico (formatação, cores etc). Se "
-"marcado, o Gajim apenas mostrará as mensagens em texto puro."
+"marcado, o Gajim apenas exibirá as mensagens em texto puro."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:103
 msgid "Sort contacts by status"
 msgstr "Ordena contatos pelo status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:104 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:105
 msgid "Status _iconset:"
 msgstr "_Conjunto de ícones de status:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:106
 msgid "Style"
 msgstr "Estilo"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:107
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2129,7 +2258,7 @@ msgstr ""
 "$S será substituída pela mensagem de status anterior\n"
 "$T será substituída pela mensagem automática de ausência"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:111
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2141,103 +2270,111 @@ msgstr ""
 "$S irá ser substituída pela mensagem de status anterior\n"
 "$T irá ser substituída pela mensagem de ausência automática"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:114
 msgid "Use _transports icons"
 msgstr "Usar ícones de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:115
 msgid "Use system _default"
 msgstr "Usar o _padrão do sistema"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:118
 msgid "When new event is received:"
 msgstr "Quando novo evento é recebido:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:119
+msgid "Your message:"
+msgstr "Sua mensagem:"
+
+#: ../data/glade/preferences_window.glade.h:120
+msgid "Your nickname:"
+msgstr "Seu apelido:"
+
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_Away after:"
 msgstr "_Afastado depois:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:123
 msgid "_Display chat state notifications:"
-msgstr "_Mostrar notificações de status de conversa:"
+msgstr "_Exibir notificações de status de conversa:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:124
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:125
 msgid "_File manager:"
 msgstr "_Gerenciamento de arquivos:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore eventos de contatos que não estejam na minha lista"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorar conteúdo formatado nas mensagens recebidas"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "Mensagem _recebida:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:130
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:131
 msgid "_Not available after:"
 msgstr "_Não disponível depois:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:132
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Mensagem _enviada:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:133
 msgid "_Reset to Default Colors"
 msgstr "Voltar para as cores _padrões"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Enviar notificações de status de conversa:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:135
 msgid "_Status message:"
 msgstr "_Mensagem de status:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:136
 msgid "_URL highlight:"
 msgstr "Destaque de _URL:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:137
 msgid "_Window behavior:"
 msgstr "Comportamento da jan_ela:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:138
 msgid "in _group chats"
 msgstr "em uma c_onferência"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:139
 msgid "in _roster"
 msgstr "na _lista"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:140
 msgid "minutes"
 msgstr "minutos"
 
@@ -2270,9 +2407,8 @@ msgid "All"
 msgstr "Todos"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "todos por inscrição"
+msgstr "Todos (incluindo inscrições)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2290,7 +2426,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Ordem:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3284
 msgid "Privacy List"
 msgstr "Lista de privacidade"
 
@@ -2434,7 +2570,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefixo</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:331
 msgid "<b>Role:</b>"
 msgstr "<b>Cargo:</b>"
 
@@ -2494,8 +2630,8 @@ msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5240
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5491
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -2504,24 +2640,26 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>alguem@algumacoisa.com</b> gostaria que você <b>adicionasse</b> alguns "
+"contatos em sua lista de contatos."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
+"Corpo da mensagem <atualmente sem uso, então será escondida por padrão>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Troca de itens na lista de contatos"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-close"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2553,7 +2691,7 @@ msgstr "Exibir somente _ativos"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
-msgstr "Mostrar trans_portes"
+msgstr "Exibir trans_portes"
 
 #: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
@@ -2562,7 +2700,7 @@ msgstr "Exibir desc_onectados"
 #: ../data/glade/roster_window.glade.h:12
 #: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
-msgstr "Mostrar _lista"
+msgstr "Exibir _lista"
 
 #: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
@@ -2578,7 +2716,7 @@ msgstr "_Ações"
 msgid "_Contents"
 msgstr "Índi_ces"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1466
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -2620,11 +2758,11 @@ msgid "_Add contact"
 msgstr "_Adicionar contato"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5503
 msgid "_Information"
 msgstr "_Informações"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1317
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2644,14 +2782,6 @@ msgstr "Registrar para"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
 #: ../data/glade/single_message_window.glade.h:2
 msgid "From:"
 msgstr "De:"
@@ -2735,7 +2865,7 @@ msgstr "Enviar _mensagem simples"
 
 #: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
-msgstr "Mostrar todos _eventos pendentes"
+msgstr "Exibir todos _eventos pendentes"
 
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
@@ -2805,33 +2935,58 @@ msgid "User avatar:"
 msgstr "Avatar do usuário:"
 
 #: ../data/glade/xml_console_window.glade.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Fonte</b>"
+
+#: ../data/glade/xml_console_window.glade.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafégo do Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/glade/xml_console_window.glade.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada XML</b>"
 
 #. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
+#: ../data/glade/xml_console_window.glade.h:5
 msgid "Enable"
 msgstr "Habilitar"
 
-#. 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 "Hide IN stanzas"
+msgstr ""
+
+#: ../data/glade/xml_console_window.glade.h:7
+msgid "Hide IQ stanzas"
+msgstr ""
+
+#: ../data/glade/xml_console_window.glade.h:8
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/glade/xml_console_window.glade.h:9
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/glade/xml_console_window.glade.h:10
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#. 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:12
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/glade/xml_console_window.glade.h:8
+#: ../data/glade/xml_console_window.glade.h:14
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/glade/xml_console_window.glade.h:15
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/glade/xml_console_window.glade.h:16
 msgid "_Presence"
 msgstr "_Presença"
 
@@ -2855,279 +3010,264 @@ msgstr "Recurso:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Cancelar confirmação"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Você está na execução de um comando. Você realmente deseja cancelar?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "O serviço enviou dados inválidos"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "O serviço alterou o identificador da sessão."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "O serviço retornou um erro."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Ativado"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Desativado"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Inteiro"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Cor"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Nome da preferência"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Nada)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Escondido"
 
-#: ../src/atom_window.py:110
-#, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Você recebeu uma nova entrada:"
+#: ../src/atom_window.py:119
+#, python-format
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Você recebeu novas entradas (e %d não exibida):"
+msgstr[1] "Você recebeu novas entradas (e %d não exibidas):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Inglês"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretão"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Alemão"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Inglês britânico"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Francês"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norueguês (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Holandês"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Português Brasileiro"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Chinês (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Idioma do corretor ortográfico"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 msgid "Strike"
 msgstr "Tachado"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr "Fonte"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 msgid "Clear formating"
 msgstr "Limpar formatação"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Realmente enviar o arquivo?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Se você enviar um arquivo para %s, ele(a) saberá o seu Jabber ID real."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1426 ../src/chat_control.py:1904
 msgid "GPG encryption enabled"
 msgstr "Criptografia GPG habilitada"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1451 ../src/common/contacts.py:158
+#: ../src/common/contacts.py:277 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:243 ../src/dialogs.py:1059 ../src/dialogs.py:1971
+#: ../src/dialogs.py:2000 ../src/gui_interface.py:607
+#: ../src/gui_menu_builder.py:251 ../src/gui_menu_builder.py:394
+#: ../src/roster_window.py:1586 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1908 ../src/roster_window.py:3211
+#: ../src/roster_window.py:3237
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1495
 msgid "This contact does not support file transfer."
 msgstr "Este contato não suporta transferência de arquivo."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1498
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Você precisa saber o JID real do usuário para lhe enviar um arquivo."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Artista desconhecido"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Título desconhecido"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Fonte desconhecida"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1579
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-msgstr ""
-"<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
-"de <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
+msgstr "%(type)s estado: %(state)s, razão: %(reason)s"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1766
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da conferência %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1884 ../src/dialogs.py:4670
 msgid "No GPG key assigned"
 msgstr "Nenhuma chave GPG atribuída"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1885
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3135,50 +3275,50 @@ msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Você não poderá "
 "criptografar mensagem com GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1894
 msgid "GPG encryption disabled"
 msgstr "Criptografia GPG desabilitada"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1920
 msgid "Session WILL be logged"
 msgstr "A sessão SERÁ gravada"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1922
 msgid "Session WILL NOT be logged"
 msgstr "A sessão NÃO SERÁ gravada"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1939
 msgid "is"
 msgstr "está"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1939
 msgid "is NOT"
 msgstr "NÃO está"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1941
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1941
 msgid "will NOT"
 msgstr "NÃO será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1945
 msgid "and authenticated"
 msgstr "e autenticada"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1949
 msgid "and NOT authenticated"
 msgstr "e NÃO autenticada"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1956
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3187,23 +3327,23 @@ msgstr ""
 "Criptografia%(type)s %(status)s ativa %(authenticated)s.\n"
 "Sua conversa %(logged)s está sendo gravada."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2096
 msgid "Session negotiation cancelled"
 msgstr "Negociação da sessão cancelada"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2105
 msgid "This session is encrypted"
 msgstr "Esta sessão está criptografada"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2108
 msgid " and WILL be logged"
 msgstr " e SERÁ gravada"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2110
 msgid " and WILL NOT be logged"
 msgstr " e NÃO SERÁ gravada"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2115
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3211,25 +3351,25 @@ msgstr ""
 "Identidade do contato remoto não verificada. Clique no botão de proteção "
 "para mais detalhes."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2117
 msgid "E2E encryption disabled"
 msgstr "Criptografia E2E desabilitada"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2154 ../src/chat_control.py:2167
 msgid "The following message was NOT encrypted"
 msgstr "A seguinte mensagem NÃO estava criptografada"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2160
 msgid "The following message was encrypted"
 msgstr "A seguinte mensagem estava criptografada"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2432
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Você acabou de receber uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2433
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3237,15 +3377,15 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2576 ../src/common/connection_handlers.py:1559
+#: ../src/common/connection_handlers.py:1610
+#: ../src/common/connection_handlers.py:1804
+#: ../src/common/connection_handlers.py:1949 ../src/common/connection.py:433
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Erro na base de dados"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2577
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3254,110 +3394,110 @@ msgstr ""
 "O arquivo da base de dados (%s) não pode ser lido. Tente repará-lo ou removê-"
 "lo. (todo o histórico será perdido)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2815
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s agora está %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "criando banco de dados de logs"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:122 ../src/common/check_paths.py:133
+#: ../src/common/check_paths.py:140
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é um arquivo, mas deveria ser um diretório"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:123 ../src/common/check_paths.py:134
+#: ../src/common/check_paths.py:141 ../src/common/check_paths.py:149
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:148
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é um diretório, mas deveria ser um arquivo"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:164
 #, python-format
 msgid "creating %s directory"
 msgstr "criando diretório %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Alterar informação de status"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Alterar status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Definir o tipo e a descrição da presença"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Livre para conversa"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Conectado"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Muito afastado"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Não perturbe"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Desconectado"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Descrição da presença:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "O status foi alterado."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Sair das salas"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s da sala %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Você não entrou em uma sala."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr "Selecione as salas das quais você quer sair"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:212 ../src/common/contacts.py:137
+#: ../src/common/helpers.py:55 ../src/roster_window.py:813
+#: ../src/roster_window.py:1590 ../src/roster_window.py:1592
+#: ../src/roster_window.py:5132
 msgid "Groupchats"
 msgstr "Salas"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Você saiu das seguintes salas:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Encaminhar mensagens não lidas"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Todas as mensagens não lidas foram encaminhadas."
 
@@ -3367,7 +3507,7 @@ msgstr "Tocar som quando usuário estiver ocupado"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
+msgstr "Usar DBus e Notification-Daemon para exibir notificações"
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
@@ -3408,49 +3548,44 @@ msgstr ""
 "\"eventos\" e \"sempre\"."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Apelido inválido"
+msgstr "Cor do apelido de entrada."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Cor do apelido de saída."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Cor do texto de entrada."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Cor do texto de saída."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "texto da mensagem de status"
+msgstr "Cor do texto da mensagem de status."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Apelido inválido"
+msgstr "Fonte do apelido de entrada."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Mudando apelido"
+msgstr "Fonte do apelido de saída."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Fonte do texto de entrada."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Fonte do texto de saída."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "texto da mensagem de status"
+msgstr "Fonte do texto da mensagem de status."
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3459,9 +3594,9 @@ msgstr ""
 "Lista (separada por espaços) de linhas (contas e grupos) que estão agrupados."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:493
+#: ../src/common/optparser.py:285 ../src/common/optparser.py:481
+#: ../src/common/optparser.py:515 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "padrão"
 
@@ -3475,9 +3610,9 @@ msgid ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
-"'sempre' - mostrar hora para cada mensagem.\n"
-"'às vezes' - mostrar hora a cada print_ichat_every_foo_minutes minutos.\n"
-"'nunca' - nunca mostrar a hora."
+"'sempre' - exibir hora para cada mensagem.\n"
+"'às vezes' - exibir hora a cada print_ichat_every_foo_minutes minutos.\n"
+"'nunca' - nunca exibir a hora."
 
 #: ../src/common/config.py:114
 msgid ""
@@ -3485,7 +3620,7 @@ msgid ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
-"Mostrar a hora nas conversas usando relógio impreciso. O valor de imprecisão "
+"Exibir a hora nas conversas usando relógio impreciso. O valor de imprecisão "
 "varia de 1 a 4, 0 desabilita a função. 1 é relógio mais preciso, 4 é o "
 "menos. Isto é usado apenas se o valor de print_time for 'às vezes'."
 
@@ -3534,9 +3669,9 @@ msgid ""
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 "Esta opção lhe permite personalizar o carimbo de tempo que é exibido na "
-"conversação. Por exemplo: \"[%H:%M]\" mostrará \"[hora:minuto]\". Procure "
-"por strftime na documentação do Python: http://docs.python.org/lib/module-"
-"time.html"
+"conversação. Por exemplo: \"[%H:%M]\" exibirá \"[hora:minuto]\". Procure por "
+"strftime na documentação do Python: http://docs.python.org/lib/module-time."
+"html"
 
 #: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
@@ -3560,22 +3695,26 @@ msgstr ""
 
 #: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Quantos minutos mostrar ao exibir as últimas linhas da conversação anterior."
+msgstr "Quantos minutos exibir as últimas linhas da conversação anterior."
 
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
 msgstr ""
+"Quantas linhas requisitar ao servidor quando entrar em uma conferência."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr ""
+"Quantos minutos esperar para requisitar registros quando entrar em uma sala."
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Quantos segundos aguardar antes de tentar reconectar a uma conferência que "
+"você foi desconectado. Definir para 0 irá desabilitar a tentativa de re-"
+"conexão (autorejoining)."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3686,15 +3825,15 @@ msgstr "Notificar os eventos no ícone da bandeja do sistema."
 
 #: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
-msgstr "Mostrar aba quando tiver apenas uma bate papo?"
+msgstr "Exibir aba quando tiver apenas uma bate papo?"
 
 #: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
-msgstr "Mostrar borda de caderno tabulada nas janelas de conversa?"
+msgstr "Exibir borda de caderno tabulada nas janelas de conversa?"
 
 #: ../src/common/config.py:204
 msgid "Show close button in tab?"
-msgstr "Mostrar botão de fechar na aba?"
+msgstr "Exibir botão de fechar na aba?"
 
 #: ../src/common/config.py:205
 msgid ""
@@ -3738,7 +3877,7 @@ msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 msgstr ""
-"Se verdadeiro, Gajim mostrará um ícone para cada aba contendo mensagens não "
+"Se verdadeiro, Gajim exibirá um ícone para cada aba contendo mensagens não "
 "lidas. Dependendo do tema, este ícone pode ser animado."
 
 #: ../src/common/config.py:223
@@ -3749,11 +3888,11 @@ msgstr ""
 "Se verdadeiro, o Gajim indicará a mensagem de status, se não estiver vazia, "
 "para cada contato sob o nome do contato na janela da lista."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Define a posição do avatar na lista. Pode ser esquerda ou direita"
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:230
 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."
@@ -3761,7 +3900,7 @@ msgstr ""
 "Se verdadeiro, Gajim pedirá por avatar cada contato que não teve um avatar "
 "ou tem um cache que é velho demais."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:231
 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."
@@ -3769,7 +3908,7 @@ msgstr ""
 "Se falso, você não verá por mais muito tempo a linha de status nas conversas "
 "quando um contato alterar seu status e/ou sua mensagem de status."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:232
 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 "
@@ -3778,34 +3917,34 @@ msgid ""
 "group chat."
 msgstr ""
 "pode ser \"none\" (nenhum), \"all\" (todos) ou \"in_and_out\" (dentro e "
-"fora). Se for \"none\", o Gajim não mostrará mais o status nas conferências "
+"fora). Se for \"none\", o Gajim não exibirá mais o status nas conferências "
 "quando um membro alterar seu status e/ou sua mensagem de status. Se for \"all"
 "\" o Gajim exibirá todas as mensagens de status. Se for \"in_and_out\" o "
-"Gajim só mostrará FOO entradas/saídas em conferências."
+"Gajim só exibirá FOO entradas/saídas em conferências."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Cor de fundo dos contatos quando eles simplesmente conectarem."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Cor de fundo dos contatos quando eles simplesmente desconectarem."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se Verdadeiro, as mensagens restauradas usarão uma fonte menor que o padrão."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
-msgstr "Não mostrar o avatar para o próprio transporte."
+msgstr "Não exibir o avatar para o próprio transporte."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
-msgstr "Não mostrar a lista na bandeja do sistema."
+msgstr "Não exibir a lista na bandeja do sistema."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:240
 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 "
@@ -3815,7 +3954,7 @@ msgstr ""
 "faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
 "Janela) quando esperam eventos pendentes."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:242
 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 "
@@ -3826,7 +3965,7 @@ msgstr ""
 "informações sha na presenças de conferências."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3847,48 +3986,48 @@ msgstr ""
 "'pertype' - Cada tipo de mensagem (ex. bate-papo vs. conferência) são "
 "enviadas para uma janela específica."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Se falso, você não verá por muito tempo o avatar na janela do bate-papo."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se verdadeiro, pressionando a tecla Esc fecha a aba/janela."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Esconder os botões nas janelas de conversa."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Esconder o banner na janela de conferência"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Esconder o banner na janela de conversa para duas pessoas"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Esconder a lista dos ocupantes da sala na janela da conferência."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:252
 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 ""
-"Em uma conferência, mostrar o apelido no começo da linha apenas quando a "
+"Em uma conferência, exibir o apelido no começo da linha apenas quando a "
 "mensagem atual não for da mesma pessoa que mandou a última."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Usar identação ao mesclar apelidos consecutivos."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Suavizar a rolagem de mensagens na janela de conversação"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3896,39 +4035,37 @@ msgstr ""
 "A lista de cores, separadas por \":\", que serão usadas para colorir os "
 "apelidos nas salas de conferência."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Quando nenhum aba tiver uma mensagem não lida, Ctrl + Tab vai para a próxima "
 "aba."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
-"Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
-"vazia significa que nós nunca devemos mostrar o diálogo."
+"Devemos exibir o diálogo de confirmação de metacontatos ou não? Uma string "
+"vazia significa que nós nunca devemos exibir o diálogo."
 
-#: ../src/common/config.py:257
-#, fuzzy
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
-"vazia significa que nós nunca devemos mostrar o diálogo."
+"Devemos exibir o diálogo de confirmação de metacontatos ou não? Uma string "
+"vazia significa que nós nunca devemos exibir o diálogo."
 
-#: ../src/common/config.py:258
-#, fuzzy
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
-"vazia significa que nós nunca devemos mostrar o diálogo."
+"Devemos exibir o diálogo de confirmação status customizados ou não? Uma "
+"string vazia significa que nós nunca devemos exibir o diálogo."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3939,7 +4076,7 @@ msgstr ""
 "autenticado com uma prioridade negativa, você NÃO poderá receber nenhuma "
 "mensagem do seu servidor."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3947,24 +4084,23 @@ msgstr ""
 "Se verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
 "as senhas das contas."
 
-#: ../src/common/config.py:261
-#, fuzzy
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Se verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
-"as senhas das contas."
+"Se verdadeiro, o Gajim usará o KDE Wallet (se disponível) para armazenar as "
+"senhas das contas."
 
-#: ../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."
 msgstr ""
-"Se Verdadeiro, o Gajim mostrará o número de contatos online e do total de "
+"Se Verdadeiro, o Gajim exibirá o número de contatos online e do total de "
 "contatos nas linha de conta e grupo."
 
-#: ../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"
@@ -3972,7 +4108,7 @@ msgstr ""
 "Pode ser vazio, 'chat' ou 'normal'. Se for vazio, trata todas as mensagens "
 "recebidas como se elas fossem do tipo especificado"
 
-#: ../src/common/config.py: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."
@@ -3980,7 +4116,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim irá rolar e selecionar o contato que lhe enviou a "
 "última mensagem, se a janela de conversa ainda não estiver aberta."
 
-#: ../src/common/config.py: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."
@@ -3988,13 +4124,13 @@ msgstr ""
 "Se definido como verdadeiro o Gajim converterá strings entre $$ e $$ em uma "
 "imagem usando o dvips antes de inseri-la em uma janela de conversa."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "O tempo de inatividade necessário antes de fechar a janela de alteração de "
 "status."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4002,7 +4138,7 @@ msgstr ""
 "Número máximo de linhas que são exibidas em conversações. As linhas mais "
 "antigas são apagadas."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4010,11 +4146,11 @@ msgstr ""
 "Se marcado como Verdadeiro as janelas de notificação do notification-daemon "
 "serão anexadas ao ícone da bandeja do sistema."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Escolha intervalo entre 2 verificações de inatividade."
 
-#: ../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."
@@ -4022,7 +4158,7 @@ msgstr ""
 "Alterar o valor para alterar o status das fórmulas latex exibidas. Quanto "
 "mais elevado é maior."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4030,7 +4166,7 @@ msgstr ""
 "Esquema uri válido. Somente esquemas nesta lista irão ser aceitos como uri "
 "\"real\". (mailto e xmpp são manipulados separadamente)"
 
-#: ../src/common/config.py:272
+#: ../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!"
@@ -4039,17 +4175,37 @@ msgstr ""
 "conexão com uma conta for estabelecida. AVISO: Isto pode resultar em muitas "
 "requisições a serem enviadas."
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Se verdadeiro, a ação de auto-completar na conferência irá ser como a do "
+"shell"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"Quando a linha de auto contatos é exibida. Pode ser \"sempre\", "
+"\"quando_em_outro_recurso\" ou \"nunca\""
+
+#: ../src/common/config.py:280
+msgid ""
+"If True, Gajim will try to use a STUN server when using jingle. The one in "
+"\"stun_server\" option, or the one given by the jabber server."
+msgstr ""
+
+#: ../src/common/config.py:281
+msgid "STUN server to use when using jingle"
+msgstr ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:282
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
+msgstr ""
+
+#: ../src/common/config.py:294
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4057,7 +4213,7 @@ msgstr ""
 "A prioridade será alterada automaticamente de acordo com o seu status. As "
 "prioridades são definidas nas opções autopriority_*."
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:302
 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"
@@ -4066,39 +4222,40 @@ msgstr ""
 "inativo, fora, np, invisível. NOTA: esta opção é usada somente se a opção "
 "restore_last_status estiver desativada"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:303
 msgid "If enabled, restore the last status that was used."
 msgstr "Se habilitado, restaura o último status que foi usado."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:305
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
+"Se verdadeiro, requisição de autorização de contatos  irão ser "
+"automaticamente aceitos."
 
-#: ../src/common/config.py:298
-#, fuzzy
+#: ../src/common/config.py:306
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
-"Se falso, você não verá por muito tempo o avatar na janela do bate-papo."
+"Se falso, esta conta será desativada e não irá aparecer na lista de contatos."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:309
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Se desativado, não assinar presenças com chaves GPG, se o GPG estiver "
 "configurado."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:311
 msgid "Enable ESessions encryption for this account."
 msgstr "Habilitar criptografia ESessions para esta conta."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:312
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "O Gajim deve iniciar automaticamente em sessão criptografada quando possível?"
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:313
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4106,30 +4263,30 @@ msgstr ""
 "Lista ordenada de tipos de conexão (separada por espaço) para tentar. Pode "
 "conter tls, ssl ou simples"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:314
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:315
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Exibir uma mensagem de alerta antes de usar uma biblioteca padrão SSL."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:317
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espaços de erros do ssl para ignorar."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:326
 msgid "Whitespace sent after inactivity"
 msgstr "Espaço em branco enviado após inatividade"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:327
 msgid "XMPP ping sent after inactivity"
 msgstr "Ping XMPP enviado após inatividade"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:331
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4138,11 +4295,11 @@ msgstr ""
 "tentar reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:335
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 rodando"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:338
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4150,15 +4307,15 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:352
 msgid "Answer to receipt requests"
 msgstr "Respostas para requisições recebidas"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:353
 msgid "Sent receipt requests"
 msgstr "Requisições recebidas enviadas"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:363
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4166,11 +4323,11 @@ msgstr ""
 "Ao negociar uma sessão criptografada, o Gajim deve assumir que você quer que "
 "suas mensagens sejam gravadas?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:427
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "O OpenPGP está ativado para este contato?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:428
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4178,101 +4335,101 @@ msgstr ""
 "O Gajim deve iniciar automaticamente uma sessão criptografada com este "
 "contato quando possível?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:429 ../src/common/config.py:432
 msgid "Language for which we want to check misspelled words"
 msgstr "Idioma a usar na verificação ortográficas das palavras"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:438
 msgid "all or space separated status"
 msgstr "todos ou lista de status separados por espaço"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:439
 msgid "'yes', 'no', or 'both'"
 msgstr "'sim', 'não' ou 'ambos'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:440 ../src/common/config.py:442
+#: ../src/common/config.py:443 ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "'yes', 'no' or ''"
 msgstr "'sim', 'não', ou ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:453 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:454
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:454
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:455 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:455
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:456
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:456
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:457 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:457
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:458
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:458
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:459
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:459
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:470
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:471
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:472 ../src/config.py:1572
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:473
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:474
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:475 ../src/common/config.py:476
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:486
 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."
@@ -4280,98 +4437,89 @@ msgstr ""
 "Som para tocar quando uma mensagem MUC conter uma das palavras no "
 "muc_hightlight_words, ou quando uma mensagem MUC contiver seu apelido."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:487
 msgid "Sound to play when any MUC message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:496 ../src/common/optparser.py:299
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:500 ../src/common/optparser.py:285
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:504
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:508
 msgid "marine"
 msgstr "marinho"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:84
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Incapaz de carregar o módulo inativo"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-msgid "Wrong host"
-msgstr "Servidor errado"
-
-#: ../src/common/connection_handlers.py:245
-msgid "Invalid local address? :-O"
-msgstr "Endereço local inválido? :-O"
-
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "A informação do registo para o transporte %s não chegou a tempo"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registro realizado com sucesso"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registro com o agente %s completado com sucesso"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:127
 msgid "Registration failed"
 msgstr "Falha ao registrar"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:127
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registro com o agente %(agent)s falhou com erro %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:430
+#: ../src/common/connection_handlers.py:1557
+#: ../src/common/connection_handlers.py:1608
+#: ../src/common/connection_handlers.py:1802
+#: ../src/common/connection_handlers.py:1947 ../src/common/connection.py:431
+#: ../src/gajim.py:353
 msgid "Disk Write Error"
 msgstr "Erro de escrita em disco"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:653 ../src/common/connection.py:1437
 msgid "Invisibility not supported"
 msgstr "Sem suporte a invisibilidade"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:654 ../src/common/connection.py:1438
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "A conta %s não suporta invisibilidade."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1377 ../src/common/connection.py:246
+#: ../src/config.py:2034 ../src/config.py:2043 ../src/config.py:2102
+#: ../src/config.py:3456 ../src/dataforms_widget.py:577 ../src/dialogs.py:2778
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID inválido:"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1378
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Uma mensagem de um JID não-valido recebida, ela foi ignorada."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:1560
+#: ../src/common/connection_handlers.py:1611
+#: ../src/common/connection_handlers.py:1805
+#: ../src/common/connection_handlers.py:1950 ../src/common/connection.py:434
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4381,7 +4529,7 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) ou removê-lo (todo o histórico "
 "será perdido)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:1657
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Apelido não permitido: %s"
@@ -4389,76 +4537,76 @@ msgstr "Apelido não permitido: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:1752
+#: ../src/common/connection_handlers.py:1760
+#: ../src/common/connection_handlers.py:1766
+#: ../src/common/connection_handlers.py:1769
+#: ../src/common/connection_handlers.py:1772
+#: ../src/common/connection_handlers.py:1776 ../src/gui_interface.py:129
 msgid "Unable to join group chat"
 msgstr "Impossível ingressar na sala"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:1753
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Número máximo de usuários para %s foi atingido"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1761
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Você está banido da sala %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:1767
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "A sala %s não existe."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:1770
 msgid "Group chat creation is restricted."
 msgstr "A criação de sala é restrita."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:1773
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Seu nickname registado deve ser usado na sala %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:1777
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Você não está na lista de membros da sala %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:1820
 msgid "Room has been destroyed"
 msgstr "A sala foi excluída"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:1828
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Você pode entrar nessa sala ao invés: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:1859
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adiciona-lo à minha lista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:1880
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nós estamos agora inscritos para %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:1882
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "remoção de inscrição solicitada por %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:1884
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nós estamos agora sem inscrição para %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2079
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4596,81 +4744,109 @@ msgstr "O uso das chaves não inclui assinatura de certificado"
 msgid "Application verification failure"
 msgstr "Verificação do aplicativo falhou"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:247 ../src/dialogs.py:2779
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Não é possível enviar uma mensagem para %s, este não é um JID válido."
+
+#: ../src/common/connection.py:269
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Nem a presença remota está assinada, nem uma chave foi atribuída."
+
+#: ../src/common/connection.py:272
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "A chave do contato (%s) não coincide com a chave atribuída no Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:320
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Esta mensagem está *criptografada* (Veja :XEP:`27`)]"
+
+#: ../src/common/connection.py:421
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Assunto: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:771
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:772
 msgid "Reconnect manually."
 msgstr "Reconecte manualmente."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:784
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "O servidor %(name)s respondeu erroneamente à requisição de registro: %(error)"
 "s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:818
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "O servidor %s forneceu um formulário de registro diferente"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:831
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erro de SSL desconhecido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:846
 msgid "Invalid answer"
 msgstr "Resposta inválida"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:847
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "O transporte %(name)s respondeu erroneamente à requisição de registro do "
 "pedido: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1128 ../src/common/connection.py:1257
+#: ../src/common/connection.py:1748
+#: ../src/common/zeroconf/connection_zeroconf.py:191
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1129 ../src/gui_interface.py:701
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1134
 #, python-format
 msgid "Server replied: %s"
 msgstr "O servidor respondeu: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1147
 msgid "Connection to proxy failed"
 msgstr "Falha na conexão com o proxy"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1178 ../src/common/connection.py:1237
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Não foi possível conectar a conta %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1179 ../src/common/connection.py:1238
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "A conexão com a conta %s foi perdida. Tentando reconectar."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1204
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "A autenticidade do certificado %s pode ser inválida."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1207
 #, python-format
 msgid ""
 "\n"
@@ -4679,7 +4855,7 @@ msgstr ""
 "\n"
 "Erro de SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1209
 #, python-format
 msgid ""
 "\n"
@@ -4688,24 +4864,24 @@ msgstr ""
 "\n"
 "Erro de SSL desconhecido: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1258
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1289
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1291
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se seu login e senha estão corretos."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1360
 msgid "Error while removing privacy list"
 msgstr "Erro ao remover lista de privacidade"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1361
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4714,77 +4890,43 @@ msgstr ""
 "A lista de privacidade %s não foi removida. Ela pode estar ativa em um ou "
 "mais recursos conectados. Desative-os e tente novamente."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Não é possível enviar uma mensagem para %s, este não é um JID válido."
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Nem a presença remota está assinada, nem uma chave foi atribuída."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "A chave do contato (%s) não coincide com a chave atribuída no Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Esta mensagem está *criptografada* (Veja :XEP:`27`)]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Assunto: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1614
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Enviar contato: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1617
 msgid "Sent contacts:"
-msgstr "Convidar _contatos"
+msgstr "Enviar contatos:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1782 ../src/common/connection.py:1805
 msgid "Not fetched because of invisible status"
 msgstr "Não baixado por causa do status invisível"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2208
 msgid "Unregister failed"
-msgstr "Falha ao registrar"
+msgstr "Falha ao cancelar registro"
 
-#: ../src/common/connection.py:1983
-#, fuzzy, python-format
+#: ../src/common/connection.py:2209
+#, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
-"Registro com o agente %(agent)s falhou com erro %(error)s: %(error_msg)s"
+msgstr "Cancelamento de registro com o servidor %(server)s falhou: %(error)s:"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:607
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:139 ../src/common/contacts.py:363
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1463 ../src/gui_interface.py:412
+#: ../src/roster_window.py:852 ../src/roster_window.py:1511
+#: ../src/roster_window.py:1582 ../src/roster_window.py:1584
+#: ../src/roster_window.py:1742
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:371
 msgid "Not in roster"
 msgstr "Fora da lista"
 
@@ -4800,31 +4942,37 @@ msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "O D-Bus não está sendo executado corretamente nesta máquina"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "O pysqlite2 (ou python-pysqlite2) está faltando. Encerrando..."
-
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "A base de dados não pôde ser lida."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Serviço não disponível: o Gajim não está funcionando ou a opção "
 "'remote_control' é falsa"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "O D-Bus não está presente nesta máquina ou o módulo do Python está faltando"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"O bus de sessão não está disponível.\n"
+"Veja http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "O bus de sessão não está disponível.\n"
 "Veja http://trac.gajim.org/wiki/GajimDBus"
@@ -4880,69 +5028,69 @@ msgstr "onze"
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
 #. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy, python-format
+#, python-format
 msgid "%(0)s o'clock"
-msgstr "$0 horas"
+msgstr "%(0)s horas"
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy, python-format
+#, python-format
 msgid "five past %(0)s"
-msgstr "$0 e cinco"
+msgstr "%(0)s e cinco"
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy, python-format
+#, python-format
 msgid "ten past %(0)s"
-msgstr "$0 e dez"
+msgstr "%(0)s e dez"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "quarter past %(0)s"
-msgstr "$0 e quinze"
+msgstr "%(0)s e quinze"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "twenty past %(0)s"
-msgstr "$0 e vinte"
+msgstr "%(0)s e vinte"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "twenty five past %(0)s"
-msgstr "$0 e vinte e cinco"
+msgstr "%(0)s e vinte e cinco"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "half past %(0)s"
-msgstr "$0 e meia"
+msgstr "%(0)s e meia"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "twenty five to %(1)s"
-msgstr "vinte e cinco para as $1"
+msgstr "vinte e cinco para as %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "twenty to %(1)s"
-msgstr "vinte para as $1"
+msgstr "vinte para as %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy, python-format
+#, python-format
 msgid "quarter to %(1)s"
-msgstr "quinze para as $1"
+msgstr "quinze para as %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy, python-format
+#, python-format
 msgid "ten to %(1)s"
-msgstr "dez para as $1"
+msgstr "dez para as %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy, python-format
+#, python-format
 msgid "five to %(1)s"
-msgstr "cinco para as $1"
+msgstr "cinco para %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy, python-format
+#, python-format
 msgid "%(1)s o'clock"
-msgstr "$1 horas"
+msgstr "%(1)s horas"
 
 #: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
@@ -4992,240 +5140,273 @@ msgstr "Fim da semana"
 msgid "Weekend!"
 msgstr "Final de semana!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:149
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:154
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:160
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:167
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:207
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:209
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:212
 msgid "_Not Available"
 msgstr "_Não disponível"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:217
 msgid "_Free for Chat"
 msgstr "Livre para _conversa"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:219
 msgid "Free for Chat"
 msgstr "Livre para conversa"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:222
 msgid "_Available"
 msgstr "Dis_ponível"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:224 ../src/features_window.py:118
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:226
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:229
 msgid "A_way"
 msgstr "_Afastado"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:234
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:236
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:239
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:245
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:252
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:254
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:258
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:266
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para inscrição):Nenhuma"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:268
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:277
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:280
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:282
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:285
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:287
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:290
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:292
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:298
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Filiação do contato de conferência:Nenhuma"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:300
 msgid "Owner"
 msgstr "Dono"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:302
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:304
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:343
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:345
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:347
 msgid "is composing a message..."
 msgstr "está digitando..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:350
 msgid "paused composing a message"
 msgstr "parou de digitar"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:352
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:617
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:620
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:624
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:627
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:631
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:634
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:637
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1112
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensagem pendente"
 msgstr[1] "%d mensagens pendentes"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1118
 #, python-format
 msgid " from room %s"
 msgstr " da sala %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1121 ../src/common/helpers.py:1140
 #, python-format
 msgid " from user %s"
 msgstr " do usuário %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1123
 #, python-format
 msgid " from %s"
 msgstr " de %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1130 ../src/common/helpers.py:1137
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento pendente"
 msgstr[1] "%d eventos pendentes"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1170
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/jingle_rtp.py:102
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Configuração da sala"
+
+#: ../src/common/jingle_rtp.py:103
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:289
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:292
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:321
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:329
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Erro executando \"%(command)s\": %(error)s"
@@ -5235,17 +5416,76 @@ msgstr "Erro executando \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s não é um nível de gravação (loglevel) válido"
 
+#: ../src/common/multimedia_helpers.py:36
+#, fuzzy
+msgid " Default device"
+msgstr "Mensagem padrão"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:52
+#, fuzzy
+msgid "Audio test"
+msgstr "Áudio / Vídeo"
+
+#. Auto src
+#. Auto sink
+#. Auto src
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:58
+#: ../src/common/multimedia_helpers.py:70
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Tamanho: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:66
+#: ../src/common/multimedia_helpers.py:93
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:78
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src ; TODO: Figure out why it doesn't work
+#: ../src/common/multimedia_helpers.py:83
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. xvimage sink
+#: ../src/common/multimedia_helpers.py:97
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:99
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:52
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:295
 msgid "cyan"
 msgstr "azul celeste"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:374
 msgid "migrating logs database to indices"
 msgstr "migrando base de dados de registros para índices"
 
@@ -5254,641 +5494,662 @@ msgstr "migrando base de dados de registros para índices"
 msgid "XMPP account %s@%s"
 msgstr "Conta XMPP %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Amedrontado"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Surpreso"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Amoroso"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Irado"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Chateado"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Estimulado"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Envergonhado"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Entediado"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Corajoso"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Calmo"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Cauteloso"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Indiferente"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Confidente"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Confuso"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Contemplativo"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Contente"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Nervoso"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Louco"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Criativo"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Curioso"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Abatido"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Deprimido"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Desapontado"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Enojado"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Consternado"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Distraído"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Envergonhado"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Com inveja"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Paquerador"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustrado"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Agradecido"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Angustiado"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Mal-humorado"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Culpado"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Esperançoso"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Quente"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Humilde"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Humilhado"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Com fome"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Machucado"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Impressionado"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Chocado"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Apaixonado"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Indignado"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Interessado"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Intoxicado"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Invencível"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Envergonhado"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Sozinho"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Perdido"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Sortudo"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Mau"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Mal-humorado"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervoso"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutro"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Ofendido"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Indignado"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Brincalhão"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Orgulhoso"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Relaxado"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Aliviado"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Arrependido"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Inquieto"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarcástico"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Satisfeito"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Sério"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Chocado"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Tímido"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Doente"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Com sono"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Espontâneo"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Estressado"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Forte"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Surpreso"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Agradecido"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Com sede"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Cansado"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Fraco"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Preocupado"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Atarefado"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Fazendo compras"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Limpando"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Cozinhando"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Fazendo manutenção"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Lavando a louça"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Lavando roupas"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Fazendo jardinagem"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Realizando uma tarefa"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Passeando com o cachorro"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Bebendo"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Bebendo uma cerveja"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Tomando café"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Tomando chá"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Fazendo um lanche"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Tomando café da manhã"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Jantando"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Almoçando"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Exercitando"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Andando de bicicleta"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Dançando"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Fazendo caminhada"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Correndo"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Praticando esportes"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Correndo"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Esquiando"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Nadando"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Trabalhando fora"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Afagando"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "No Spa"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Escovando os dentes"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Cortando o cabelo"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Fazendo barba"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Tomando banho"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Tomando uma ducha"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Em um compromisso"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "De folga"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Me descontraindo"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Me escondendo"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "Em férias"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Orando"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Feriado"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Pensando"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Relaxando"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Pescando"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Jogando"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Saindo"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Festejando"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Lendo"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Ensaiando"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Comprando"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Fumando"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Socializando"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Tomando banho de sol"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Assitindo TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Assistindo um filme"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Falando"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "No mundo real"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Ao telefone"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Ao telefone"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Viajando"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Em trânsito"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Dirigindo"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "Em um carro"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "Em um ônibus"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "Em um avião"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "Em um trem"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "Em um passeio"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Andando"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Codificado"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "Em um encontro"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Estudando"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Escrevendo"
 
+#: ../src/common/pep.py:340
+msgid "Unknown Artist"
+msgstr "Artista desconhecido"
+
+#: ../src/common/pep.py:343
+msgid "Unknown Title"
+msgstr "Título desconhecido"
+
+#: ../src/common/pep.py:346
+msgid "Unknown Source"
+msgstr "Fonte desconhecida"
+
+#: ../src/common/pep.py:349
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
+"de <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:91
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossível conectar à porta %s."
 
-#: ../src/common/socks5.py:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5897,7 +6158,7 @@ msgstr ""
 "arquivos será cancelada."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5905,37 +6166,11 @@ msgstr ""
 "[Isto é parte de uma sessão criptografada. Se você estiver vendo esta "
 "mensagem, alguma coisa vai errada.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"O computador %s que você especificou na configuração avançada "
-"ft_override_host_to_send não é válido e será ignorado."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Frase de acesso do OpenPGP não foi recebida"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Você será conectado ao %s sem OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Para continuar enviando e recebendo mensagens, você precisará reconectar."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:180
 msgid "Avahi error"
 msgstr "Erro do Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 #, python-format
 msgid ""
 "%s\n"
@@ -5944,53 +6179,44 @@ msgstr ""
 "%s\n"
 "Mensagens link-local podem não funcionar adequadamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor verifique se o Avahi ou o Bonjour estão instalados."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:201
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "Could not start local service"
 msgstr "Impossível iniciar o serviço local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:202
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível conectar-se à porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor verifique se o serviço avahi-daemon está rodando."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:284
+#: ../src/common/zeroconf/connection_zeroconf.py:295
+#: ../src/common/zeroconf/connection_zeroconf.py:309
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível alterar status da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Você não está conectado ou não está visível aos outros. Sua mensagem não "
-"pode ser enviada."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Esta mensagem está criptografada]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:326
 msgid "Your message could not be sent."
 msgstr "Sua mensagem não pode ser enviada."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:336
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contato está offline. Sua mensagem não pode ser enviada."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6003,7 +6229,7 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erro ao adicionar serviço. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:169 ../src/config.py:652
 msgid "Disabled"
 msgstr "Desabilitado"
 
@@ -6015,12 +6241,12 @@ msgstr "Mensagem padrão"
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:720 ../src/dialogs.py:1363
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "O dicionário para o idioma %s não está disponível"
 
-#: ../src/config.py:664
+#: ../src/config.py:721
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6029,67 +6255,67 @@ msgstr ""
 "Você precisa instalar o dicionário %s para usar a correção ortográfica ou "
 "selecionar outro idioma ajustando a opção 'speller_language'."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1187
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1187
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1488 ../src/dialogs.py:2231 ../src/dialogs.py:2297
+#: ../src/dialogs.py:3063 ../src/disco.py:830 ../src/disco.py:1689
+#: ../src/disco.py:1991 ../src/history_window.py:89
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1581
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1582
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se você quer aplicar todas as mudanças, deve se re-autenticar."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1714 ../src/config.py:1839
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1879 ../src/config.py:1923
 msgid "Unread events"
 msgstr "Eventos não lidos"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1880
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1906
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Você iniciou uma conversa usando a conta %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1907
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Todas as janelas de conversa e conferência serão fechadas. Confirma?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1919 ../src/config.py:2442 ../src/config.py:2478
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1920
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar desconectado."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1924
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, você deve ler todas os eventos pendentes."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1930
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1931
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6097,148 +6323,146 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1935 ../src/config.py:1939
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1936
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1940
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1856
+#: ../src/config.py:2015
 msgid "Rename Account"
 msgstr "Renomear conta"
 
-#: ../src/config.py:1857
+#: ../src/config.py:2016
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entre com um novo nome para a conta %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:2044
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve ter o seguinte formato \"usuario@nomedoservidor\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2252 ../src/config.py:3502
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2253 ../src/config.py:3503
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2274
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2275
 msgid "There is no OpenPGP secret key available."
-msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
+msgstr "Não há chave secreta OpenPGP disponível."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2309
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de chave OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2310
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2317
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2318
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Você deve primeiro criar sua conta antes de editar suas informações pessoais."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2325 ../src/dialogs.py:2029 ../src/dialogs.py:2219
+#: ../src/dialogs.py:2404 ../src/disco.py:476 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2326
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Você deve estar conectado para editar suas informações pessoais."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2330
 msgid "Your server doesn't support Vcard"
 msgstr "Seu servidor não suporta Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2331
 msgid "Your server can't save your personal information."
 msgstr "Seu servidor não pode salvar suas informações pessoais."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2443 ../src/config.py:2479
 msgid "To disable the account, you must be disconnected."
-msgstr "Para mudar o nome da conta, você deve estar desconectado."
+msgstr "Para desativar esta conta, você deve estar desconectado."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2448
 msgid "Account Local already exists."
 msgstr "Conta local já existe."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2449
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor renomeie ou remova-o antes de ativar troca de mensagens \"link-"
 "local\"."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2606
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2608
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2644
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2645
 msgid "Member List"
 msgstr "Lista de membros"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2646
 msgid "Owner List"
 msgstr "Lista de proprietários"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2647
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2696 ../src/disco.py:837 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2706
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2713
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2719
 msgid "Role"
 msgstr "Cargo"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2746
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2748
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6246,11 +6470,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2750
 msgid "Adding Member..."
 msgstr "Adicionando membro..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2751
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6258,11 +6482,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2753
 msgid "Adding Owner..."
 msgstr "Adicionando proprietário..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2754
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6270,11 +6494,11 @@ msgstr ""
 "<b>Quem você quer tornar um proprietário?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2756
 msgid "Adding Administrator..."
 msgstr "Adicionando administrador..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2757
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6282,7 +6506,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2758
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6298,58 +6522,59 @@ msgstr ""
 "4. domínio (o domínio combina por si com qualquer usuario@dominio,\n"
 "domínio/recurso, ou endereço contendo um subdomínio."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2859
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2881 ../src/gui_interface.py:1104
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2882 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2883 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2892
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2893
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2991
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2991
 msgid "?print_status:All"
 msgstr "?exibir_status:Todos"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2992
 msgid "Enter and leave only"
 msgstr "Apenas entre e saia"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2993
 msgid "?print_status:None"
 msgstr "?exibir_status:Nenhum"
 
-#: ../src/config.py:2889
+#: ../src/config.py:3063
 msgid "New Group Chat"
 msgstr "Nova conferência"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3096
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tem dados inválidos"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3097
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6357,30 +6582,27 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3215 ../src/dialogs.py:1827
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3216 ../src/config.py:3230 ../src/config.py:3244
 msgid "Character not allowed"
-msgstr "Apelido não permitido: %s"
+msgstr "Caractere não permitido"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3229 ../src/config.py:3478
 msgid "Invalid server"
 msgstr "Servidor inválido"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3243
 msgid "Invalid room"
-msgstr "Entrada inválida"
+msgstr "Sala inválida"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3395
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3396 ../src/config.py:3402
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6390,34 +6612,34 @@ msgstr ""
 "avançado, ou mais tarde clicando em contas no menu editar da janela "
 "principal."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3401
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3439
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3441
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3479
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, forneça um servidor no qual você queira se registrar."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3535 ../src/gui_interface.py:1852
 msgid "Certificate Already in File"
 msgstr "Certificado já está no arquivo"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3536 ../src/gui_interface.py:1853
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Este certificado já está no arquivo %s, então, ele não será adicionado "
 "novamente."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3606
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6432,7 +6654,7 @@ msgstr ""
 "Erro do SSL: %(error)s\n"
 "Você ainda quer conectar com este servidor?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3612 ../src/gui_interface.py:1877
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6443,63 +6665,63 @@ msgstr ""
 "SHA1 fingerprint do certificado:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3639 ../src/config.py:3666
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3733
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3734
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3887
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3895
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3930
 msgid "First Message Received"
 msgstr "Primeira mensagem recebida"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3931
 msgid "Next Message Received Focused"
 msgstr "Nova mensagem recebida com foco"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3933
 msgid "Next Message Received Unfocused"
 msgstr "Nova mensagem recebida sem foco"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3934
 msgid "Contact Connected"
 msgstr "Contato conectado"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3935
 msgid "Contact Disconnected"
 msgstr "Contato desconectou"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3936
 msgid "Message Sent"
 msgstr "Mensagem enviada"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3937
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem destacada de conferência"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3938
 msgid "Group Chat Message Received"
 msgstr "Mensagem de conferência recebida"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3939
 msgid "GMail Email Received"
 msgstr "Email do GMail recebido"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:598
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6509,7 +6731,7 @@ msgstr ""
 "recebida por um fim remoto. Se este ícone continuar\n"
 "por muito tempo, isso indica que a mensagem foi perdida."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:617
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6517,229 +6739,226 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde a\n"
 "última vez onde você prestou a atenção a conferência"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:736
 msgid "_Quote"
 msgstr "_Frase"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Ações para \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:755
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:760
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _dicionário"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:777
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL do dicionário não existe \"%s\" e isto não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:790
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de procura na web não existe \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:793
 msgid "Web _Search for it"
 msgstr "_Procura na web por isto"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:799
 msgid "Open as _Link"
 msgstr "Abrir como _link"
 
-#: ../src/conversation_textview.py:1274
-msgid "Yesterday"
-msgstr "Ontem"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1285
 #, python-format
-msgid "%i days ago"
-msgstr "%i dias atrás"
+msgid "Yesterday"
+msgid_plural "%i days ago"
+msgstr[0] "Ontem"
+msgstr[1] "Há %i dias"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1320 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber ID já existente na lista"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "O Jabber ID que você forneceu já está na lista. Escolha outro."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "novo@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novo%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:80
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contato: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:193
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:200
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:291
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:296
 msgid "Contact name"
 msgstr "Nome do contato"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:468
 msgid "Set Mood"
 msgstr "Definir humor"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:588
 #, python-format
 msgid "%s Status Message"
 msgstr "%s mensagem de status"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:602
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:792
 msgid "Overwrite Status Message?"
 msgstr "Sobrescrever mensagem de status?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:793
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Este nome já está sendo usado. Você quer sobrescrever essa mensagem de "
 "status?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:801
 msgid "Save as Preset Status Message"
 msgstr "Salvar como a mensagem de status pré-configurada"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:802
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:830
 msgid "AIM Address:"
 msgstr "Endereço AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:831
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:832
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:833
 msgid "MSN Address:"
 msgstr "Endereço MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:834
 msgid "Yahoo! Address:"
 msgstr "Endereço Yahoo!:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:871
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, preencha os dados do contato se você quer adicionar na conta %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:873
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1034 ../src/dialogs.py:1040 ../src/dialogs.py:1045
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1041
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1046
 msgid "You cannot add yourself to your roster."
 msgstr "Você não pode adicionar você mesmo na sua lista."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1060
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à lista"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1061
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1097
 msgid "User ID:"
 msgstr "ID do usuário:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1158
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1159
 msgid "GTK+ Version:"
 msgstr "Versão do GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1160
 msgid "PyGTK Version:"
 msgstr "Versão do PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1170
 msgid "Current Developers:"
 msgstr "Desenvolvedores atuais:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1172
 msgid "Past Developers:"
 msgstr "Desenvolvedores passados:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1178
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1184
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Nós gostaríamos de agradecer todos os mantedores do pacote."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1196
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br>\n"
 "Juracy Filho <juracy@gmail.com>\n"
-"Djavan Fagundes <dnoway@gmail.com>\n"
+"Djavan Fagundes <djavan@comum.org>\n"
 "Og Maciel <og.maciel@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1364
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6752,99 +6971,100 @@ msgstr ""
 "\n"
 "O recurso de destacar palavras grafadas incorretamente não será usado"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1828 ../src/dialogs.py:2170
 msgid "The nickname has not allowed characters."
 msgstr "O apelido possui caracteres não permitidos."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1946
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitação de inscrição para conta %(account)s de %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1949
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2024 ../src/gui_interface.py:2591
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Você já está na conferência %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2030
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Você não pode ingressar em uma sala de conferência até que esteja conectado."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2159
 msgid "Invalid Account"
-msgstr "Nome de conta inválido"
+msgstr "Conta inválida"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Selecione a conta que você quer para entrar na sala"
+msgstr "Selecione a conta que você quer usar para para entrar na sala."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2169
 msgid "Invalid Nickname"
 msgstr "Apelido inválido"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2174 ../src/dialogs.py:2180
+#: ../src/groupchat_control.py:1762
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID da conferência inválido:"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2175
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Por favor, digite o Jabber ID da conferência como sala@servidor."
+
+#: ../src/dialogs.py:2181 ../src/groupchat_control.py:1763
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "O Jabber ID da conferência possui caracteres não permitidos."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2188
 msgid "This is not a group chat"
 msgstr "Isto não é uma conferência"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2189
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s não é o nome da conferência."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2220
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sem uma conexão, você pode não sincronizar seus contatos."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2234
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2269
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2270
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Você não pode sincronizar com uma conta a menos que esteja conectado."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2294
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2354
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2356
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2357
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6853,300 +7073,317 @@ msgstr ""
 "você quer enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2383 ../src/dialogs.py:2764 ../src/dialogs.py:2978
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2765 ../src/dialogs.py:2979
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2393 ../src/dialogs.py:2396
 msgid "Invalid JID"
 msgstr "JID inválido:"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2396
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2405
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar conectado para mudar sua senha."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2424
 msgid "Invalid password"
 msgstr "Senha inválida"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2424
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2428
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2429
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2466 ../src/notify.py:263 ../src/notify.py:499
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2468 ../src/notify.py:271 ../src/notify.py:501
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2470 ../src/notify.py:292 ../src/notify.py:344
+#: ../src/notify.py:503
 msgid "New Message"
 msgstr "Nova mensagem"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2470 ../src/notify.py:275 ../src/notify.py:345
+#: ../src/notify.py:503
 msgid "New Single Message"
 msgstr "Nova mensagem"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2471 ../src/notify.py:281 ../src/notify.py:345
+#: ../src/notify.py:504
 msgid "New Private Message"
 msgstr "Enviar mensagem privada"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2471 ../src/gui_interface.py:1312 ../src/notify.py:513
 msgid "New E-mail"
 msgstr "Novo e-mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2473 ../src/gui_interface.py:1375 ../src/notify.py:506
 msgid "File Transfer Request"
 msgstr "Solicitação de transferência de arquivos"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2475 ../src/gui_interface.py:1280
+#: ../src/gui_interface.py:1344 ../src/notify.py:508
 msgid "File Transfer Error"
 msgstr "Erro na transferência de arquivos"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2477 ../src/gui_interface.py:1420
+#: ../src/gui_interface.py:1442 ../src/gui_interface.py:1459
+#: ../src/notify.py:510
 msgid "File Transfer Completed"
 msgstr "Transferência do arquivo completa"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1423 ../src/notify.py:511
 msgid "File Transfer Stopped"
 msgstr "Transferência do arquivo parada"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1123 ../src/notify.py:515
 msgid "Groupchat Invitation"
 msgstr "Convite para conferência"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2482 ../src/notify.py:255 ../src/notify.py:517
 msgid "Contact Changed Status"
 msgstr "O contato alterou seu status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2683
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem simples usando conta %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2685
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem simples na conta %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2687
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2690
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2713
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2736
 #, python-format
 msgid "Form %s"
 msgstr "Formulário %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2815
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2816
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2874
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2876
 msgid "XML Console"
 msgstr "Console XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
-#, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Por favor, eu gostaria de adicioná-lo à minha lista."
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:3007
+msgid "add"
+msgstr "adicionar"
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
-#, fuzzy
+#: ../src/dialogs.py:3007
+msgid "modify"
+msgstr "modificar"
+
+#: ../src/dialogs.py:3008
+msgid "remove"
+msgstr "remover"
+
+#: ../src/dialogs.py:3036
+#, python-format
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%(jid)s</b> gostaria que você <b>%(action)s</b> alguns contatos na sua "
+"lista."
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3052 ../src/dialogs.py:3098
 msgid "Add"
-msgstr "Endereço"
+msgstr "Adicionar"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3054 ../src/dialogs.py:3129
 msgid "Modify"
-msgstr "Mal-humorado"
+msgstr "Modificar"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3060
 msgid "Jabber ID"
-msgstr "Jabber ID:"
+msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3066
 msgid "Groups"
-msgstr "Grupo"
+msgstr "Grupos"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3174
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Eu gostaria de adiciona-lo à minha lista."
+msgstr "%s me sugeriu adicionar você à minha lista."
+
+#: ../src/dialogs.py:3188
+#, python-format
+msgid "Added  %s contacts"
+msgstr "Adicionados %s contatos"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3225
+#, python-format
+msgid "Removed  %s contacts"
+msgstr "Removidos %s contatos"
+
+#: ../src/dialogs.py:3278
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3282
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3338
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordem: %(order)s, ação: %(action)s tipo: %(type)s, valor: %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3343
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordem: %(order)s, ação: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3387
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar uma regra</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3498
 msgid "<b>Add a rule</b>"
 msgstr "<b>Adicionar uma regra</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3598
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3600
 msgid "Privacy Lists"
 msgstr "Listas de privacidade"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3670
 msgid "Invalid List Name"
 msgstr "Nome de lista inválido"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3671
 msgid "You must enter a name to create a privacy list."
 msgstr "Você deve digitar um nome para criar uma lista de privacidade."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3703
 msgid "You are invited to a groupchat"
 msgstr "Você foi convidado para uma conferência"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3706
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact convidou você para ingressar em uma discussão"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3708
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact convidou você para entrar na conferência %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3716
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3718
 msgid "Do you want to accept the invitation?"
 msgstr "Você quer aceitar este convite?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3779
 msgid "Choose Sound"
 msgstr "Escolher som"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3789 ../src/dialogs.py:3845
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3794
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3832
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3850
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3917
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3919
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando notificação especial para %s"
 
-#. # means number
-#: ../src/dialogs.py:3804
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3994
 msgid "Condition"
 msgstr "Condição"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4114
 msgid "when I am "
 msgstr "quando eu estiver "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4590
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7157,19 +7394,19 @@ msgstr ""
 "\n"
 "A String Curta de Autenticação (SAS) da sessão é <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4593
 msgid "You have already verified this contact's identity."
 msgstr "Você já verificou a identidade deste contato."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4599 ../src/dialogs.py:4683
 msgid "Contact's identity verified"
 msgstr "Identidade do contato verificada"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4605
 msgid "Verify again..."
 msgstr "Verificar novamente..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4610
 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 "
@@ -7179,19 +7416,19 @@ msgstr ""
 "mensagens e enviar mensagens, você precisa verificar a identidade dela "
 "clicando no botão abaixo."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4613 ../src/dialogs.py:4664 ../src/dialogs.py:4677
 msgid "Contact's identity NOT verified"
 msgstr "A identidade do contato NÃO foi verificada"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4618
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4629
 msgid "Have you verified the contact's identity?"
 msgstr "Você verificou a identidade deste contato?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4630
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7206,24 +7443,24 @@ msgstr ""
 "\n"
 "Esta String de  Autenticação Curta é <b>%(sas)s</ b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4631
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Você quer falar com o contato remoto e verificar a SAS?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4665
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "A chave do contato (%s) <b>não corresponde</b> com a chave atribuída no "
 "Gajim."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4671
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Então, você não pode "
 "criptografar mensagens."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4678
 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."
@@ -7232,7 +7469,7 @@ msgstr ""
 "nesta chave</b>, então as mensagens <b>não podem</b> ser criptografadas. Use "
 "seu cliente de GPG para validar esta chave."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4684
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7240,6 +7477,27 @@ msgstr ""
 "A chave GPG está atribuída para este contato, e você validou esta chave, "
 "então as mensagens serão criptografadas."
 
+#: ../src/dialogs.py:4749
+msgid "an audio and video"
+msgstr "um áudio e vídeo"
+
+#: ../src/dialogs.py:4751
+msgid "an audio"
+msgstr "um áudio"
+
+#: ../src/dialogs.py:4753
+msgid "a video"
+msgstr "um video"
+
+#: ../src/dialogs.py:4757
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+"O %(contact)s quer iniciar uma sessão  %(type)s com você. Você quer "
+"responder a chamada?"
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Outros"
@@ -7249,24 +7507,24 @@ msgstr "Outros"
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:477
 msgid "Without a connection, you can not browse available services"
 msgstr "Você deve estar conectado para visualizar os serviços disponíveis"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:553
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar serviços usando conta %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:555
 msgid "Service Discovery"
 msgstr "Buscar serviços"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:705
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:706
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7274,237 +7532,236 @@ msgstr ""
 "Não existe serviço para o endereço que você entrou, ou não está respondendo. "
 "Verifique o endereço e tente novamente."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:710 ../src/disco.py:1046
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:711
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:750 ../src/disco.py:760
 msgid "Invalid Server Name"
 msgstr "Nome do servidor inválido"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:814
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Explorando %(address)s usando conta %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:858
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1047
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1287
 msgid "_Execute Command"
 msgstr "_Executar comando"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1297 ../src/disco.py:1468
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1509
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Varrendo %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1699
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1707
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1715
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1780 ../src/gui_interface.py:3083
 msgid "Bookmark already set"
 msgstr "Marcador já configurado"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1781 ../src/gui_interface.py:3084
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" já existe nos marcadores."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1790 ../src/gui_interface.py:3097
 msgid "Bookmark has been added successfully"
 msgstr "Marcador foi adicionado com sucesso"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1791 ../src/gui_interface.py:3098
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Você pode gerenciar seus marcadores pelo menu de ações na janela principal."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2000
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2008
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2072
 msgid "New post"
 msgstr "Nova postagem"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2078
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2084
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr "Validação de certificado SSL"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Uma biblioteca usada para validar os certificados do servidor para garantir "
 "uma conexão segura."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Requer o python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Conversa sem servidor com clientes detectados automaticamente em uma rede "
 "local."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Requer o python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Requer pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 msgid "Command line"
 msgstr "Linha de comando"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Um script para controlar o Gajim via linha de comando."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Requer o python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Recurso não disponível no Windows."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
 msgstr "Criptografia de mensagem OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Criptografando as mensagens das conversas com chaves gpg."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Requer gpg e python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Detecção automática do status da rede."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requer gnome-network-manager e python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Gerenciamento de sessão"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "A sessão do Gajim é armazenada no logout and restaurada no login."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Requer python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 msgid "Password encryption"
 msgstr "Criptografia de senha"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "As senhas podem ser armazenadas de maneira segura e não apenas em texto "
 "plano."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Requer gnome-keyring e python-gnome2-desktop."
+msgstr "Requer gnome-keyring e python-gnome2-desktop ou kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Habilidade de conectar a servidores que estão usando registros SRV."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Requer dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Requer nslookup para usar registros SRV."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Verificador ortográfico"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Verificação ortográfica das mensagens escritas."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr "Requer libgtkspell."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 msgid "Notification"
 msgstr "Notificação"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Popups passivos notificando novos eventos."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7512,51 +7769,32 @@ msgstr ""
 "Requer python-notify ou então python-dbus em conjunto com notification-"
 "daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Ícone da bandeja"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Um ícone na bandeja do sistema refletindo a presença atual."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Requer python-gnome2-extras ou módulo trayicon compilado a partir dos fontes "
-"do Gajim."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Requer PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Status automático"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Habilidade de medir o tempo de inatividade para definir o status automático."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr "Requer biblioteca libxss."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr "Requer python2.5"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transforma expressões LaTeX entre $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7564,7 +7802,7 @@ msgstr ""
 "Requer textlive-latex-base, e dvpng. Você tem que definir a opção "
 "'use_latex' para verdadeiro no Editor de configurações avançadas."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7573,23 +7811,23 @@ msgstr ""
 "definir a opção 'use_latex' para verdadeiro no Editor de configurações "
 "avançadas."
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
 msgstr "Criptografia de mensagem End to End"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Criptografando mensagens da conversa."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Requer python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "Gerador RST"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7597,141 +7835,148 @@ msgstr ""
 "Gera saída XHTML a partir de código RST (veja http://docutils.sourceforge."
 "net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Requer python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr "Banners e links clicáveis"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Habilidade de ter URL's clicáveis na janela de conversa e em banners da "
 "janela de conferência."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Requer python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr "Habilidade para iniciar uma conversa da áudio e vídeo."
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr "Requer o python-farsight."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Recurso"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %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:520
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Salvo em: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivos cancelada"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "Conexão com o par não pode ser estabelecida."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Conteúdo: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensagem de erro: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Transferência do arquivo parada"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Escolha o arquivo para enviar..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Descrição: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Este arquivo está sendo usado por outro processo."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Arquivo: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:889
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Não é possível sobrescrever o arquivo \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:891
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7739,33 +7984,33 @@ msgstr ""
 "Um arquivo com este nome já existe e você não tem permissão para sobrescrevê-"
 "lo."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:895
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:895
 msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "O diretório \"%s\" não é gravável"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:903
 msgid "You do not have permission to create files in this directory."
 msgstr "Você não tem permissão para criar este diretório."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Salvar arquivo como..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7773,32 +8018,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Arquivo inválido"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Arquivo: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar arquivos vazios"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pausa"
 
@@ -7809,22 +8054,26 @@ msgstr "O Gajim necessita do servidor X para rodar. Encerrando..."
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "importação PyGTK falhou: %s"
 
 #: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "O Gajim necessita do PyGTK 2.12 ou superior"
 
 #: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "O Gajim necessita do PyGTK 2.12 ou superior para rodar. Encerrando..."
 
 #: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "O Gajim necessita do GTK 2.12 ou superior"
 
 #: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "O Gajim necessita do GTK 2.12 ou superior para rodar. Encerrando..."
 
 #: ../src/gajim.py:189
@@ -7865,11 +8114,11 @@ msgstr ""
 "pode obtê-lo em %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:327
 msgid "Gajim is already running"
 msgstr "O Gajim já está em execução"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:328
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7877,462 +8126,28 @@ msgstr ""
 "Outra instância do Gajim parece estar rodando\n"
 "Executar de qualquer forma?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Frase de acesso é obrigatória"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr ""
-"Entre com a frase de acesso da chave GPG %(keyid)s para conta (account %"
-"(account)s)."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr "A chave GPG expirou"
-
-#: ../src/gajim.py:456
-#, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Sua chave GPG expirou, você será conectado ao %s sem OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Frase de acesso errada"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Por favor, reescreva sua frase secreta de GPG ou pressione Cancelar."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"O apelido que você deseja usar na sala %s está em uso ou registado por um "
-"outro ocupante.\n"
-"Por favor, especifique um outro apelido abaixo:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Você aceita a solicitação?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Você aceita essa requisição na conta %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Autorização HTTP (%(method)s) para %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Falha na conexão"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Erro %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "erro ao enviar %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-msgid "Subscription request"
-msgstr "Solicitação de inscrição"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorização aceita"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "O contato \"%s\" autorizou você para ver seu status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Contato \"%s\" removeu sua inscrição"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Você irá sempre ver ele ou ela como desconectado.\n"
-"Você quer removê-lo ou removê-la da sua lista de contatos?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-msgid "Unsubscribed"
-msgstr "Desinscrever"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Contato com \"%s\" não pode ser estabelecido"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s agora é conhecido como %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s agora está %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s alterou o assunto para %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "A sala agora mostra membros indisponíveis"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "a sala agora não mostra membros indisponíveis"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"Uma modificação na configuração da sala que não tem relação com privacidade "
-"ocorreu"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "A gravação das conversas da sala está ativo agora"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "A gravação das conversas da sala está desligado agora"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Agora a sala é não-anônima"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Agora a sala é semi-anônima"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Agora a sala é totalmente anônima"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Uma senha é requerida para ingressar na sala %s. Por favor, digite-a."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Você configurou o Gajim para usar o agente do GPG, mas não há agente do GPG "
-"rodando ou então ele retornou uma frase secreta incorreta.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Você está atualmente conectado sem sua chave OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Sua frase de acesso está incorreta"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Sua frase de acesso está incorreta"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr "Chave GPG não confiável"
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"A chave GPG usada para criptografar esta conversa não é confiável. Você "
-"realmente deseja criptografar esta mensagem?"
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Não me pergunte novamente"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"O Gnome Keyring está instalado mas não \t\t\t\tiniciou corretamente "
-"(provavelmente a variável de ambiente não \t\t\t\testá corretamente definida)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Novo email em %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Você tem %d nova mensagem de email"
-msgstr[1] "Você tem %d novas mensagens de email"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"De: %(from_address)s\n"
-"Assunto: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s quer te enviar um arquivo."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Remover contato da lista"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Erro lendo arquivo:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Você enviou com sucesso o %(filename)s para %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Transferência de arquivo de %(filename)s para %(name)s parado."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Não foi possível descriptografar a mensagem de %s\n"
-"Ela pode ter sido adulterada."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Não foi possível descriptografar a mensagem"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Conflito de nome de usuário"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Por favor digite um novo nome de usuário para sua conta local"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Erro."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Conflito de recurso"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Você já está conectado a essa conta com o mesmo recurso. Por favor digite um "
-"novo"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Erro ao verificar o certificado SSL"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Ocorreu um erro ao verificar o certificado SSL do seu servidor jabber: %"
-"(error)s\n"
-"Você ainda deseja conectar-se a este servidor?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignorar este erro para este certificado."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Erro de certificado SSL"
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-"Parece que o certificado SSL da conta %(account)s foi alterado ou sua "
-"conexão foi hackeada.\n"
-"Fingerprint antigo: %(old)s\n"
-"Novo fingerprint: %(new)s\n"
-"\n"
-"Você ainda quer conectar e atualizar o fingerprint do certificado?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Conexão não-segura"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Você está prestes a enviar sua senha em um conexão não-criptografada. Tem "
-"certeza que quer fazer isto?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Sim, eu realmente quero me conectar de modo não-seguro"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Você está enviando sua senha em uma conexão não-segura. Você deve instalar o "
-"PyOpenSSL para prevenir isto. Você tem certeza que quer fazer isso?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "O nó PEP não foi removido"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "O nó PEP %(node)s não foi removido: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Emoticons desabilitados"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"Você configurou um tema de emoticons que não foi encontrado, então os "
-"emoticons estão desativados."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Você configurou um tema de emoticons que não podem ser carregados. Você pode "
-"precisar atualizar o formato do arquivo emoticons.py. Veja http://trac.gajim."
-"org/wiki/Emoticons para mais detalhes."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Impossível salvar suas preferências"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Mostra uma ajuda para um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
-msgstr "mostrar ajuda no comando"
+msgstr "exibir ajuda no comando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
-msgstr "Mostrar ou esconder a janela principal"
+msgstr "exibe ou esconder a janela principal"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Exibir uma janela popup com o próximo evento pendente"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8340,50 +8155,50 @@ msgstr ""
 "Exibir uma lista de todos os contatos na lista. Cada contato aparecerá em "
 "uma linha separada"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
-msgstr "mostrar somente os contatos desta conta"
+msgstr "exibir somente os contatos desta conta"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Mudar o status da conta ou contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "mensagem"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "mensagem de status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8392,50 +8207,44 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Mudar o status da conta ou contas"
+msgstr "Mudar a prioridade da conta ou das contas"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "_Prioridade:"
+msgstr "prioridade:"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Eu quero _registrar uma nova conta"
+msgstr "prioridade que deseja dar para a conta"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"mudar status da conta \"account\". Se não especificado, tentará mudar o "
-"status de todas as contas existentes com a opção \"sincronizar com status "
-"global\" marcada"
+"mudar status da conta. Se não especificado, tentará mudar o status de todas "
+"as contas existentes com a opção \"sincronizar com status global\" marcada"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
-"Mostrar o diálogo do bate-papo onde você pode enviar mensagens para um "
-"contato"
+"Exibe o diálogo do bate-papo onde você pode enviar mensagens para um contato"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contato que você quer conversar"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se especificado, o contato é feito da lista de contatos desta conta"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "conteúdo da mensagem. A conta deve estar especificada ou \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8445,30 +8254,30 @@ msgstr ""
 "são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP', apenas configure a 'chave para ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "conteúdos da mensagem"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se especificada, a mensagem será criptografada usando esta chave pública"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificada, a mensagem será enviada usando esta conta"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8478,136 +8287,136 @@ msgstr ""
 "conta são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP, apenas configure a 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "assunto"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "assunto da mensagem"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Envia uma nova messagem para uma conferência em que você tiver ingressado."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "O JID do contato que receberá a mensagem"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID do contato"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Enviar arquivo para um contato"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "arquivo"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Lista todas as preferências e seus valores"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ajusta o valor da 'chave' ao 'valor '."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'chave' é o nome de preferência, 'valor' é o valor para ajustá-la"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Deleta um item de preferência"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a ser deletada"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Escreve o estado atual das preferências do Gajim em um arquivo .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Remover contato da lista"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Adicionar contato para a lista"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Adicionar novo contato para esta conta"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Retorna o status atual (global a menos que o cliente for especificado)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Retorna a mensagem de status atual (global a menos que a conta for "
 "especificada)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Retorna o número das mensagens não lidas"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abrir o diálogo 'Iniciar Conversa'"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversa, usando esta conta"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Envia XML personalizado"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8615,72 +8424,90 @@ msgstr ""
 "A conta em que o XML será enviado; se não estiver especificado, será enviado "
 "para todas as contas"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Alterar status"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Picture to use"
+msgstr "Apelido a ser usado"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"A conta em que o XML será enviado; se não estiver especificado, será enviado "
+"para todas as contas"
+
+#: ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Manipular uma URI xmpp:/"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI a manipular"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr "Selecione a conta na qual você quer manipular isto"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:282
 msgid "Message content"
-msgstr "conteúdos da mensagem"
+msgstr "Conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Entrar em uma sala MUC"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "sala"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Sala JID"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "apelido"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Apelido a ser usado"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "senha"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Senhas para entrar na sala"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr "Selecione a conta que você quer para entrar na sala"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Checar se o Gajim está rodando"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
-msgstr "Mostrar ou esconder a janela ipython"
+msgstr "Exibe ou esconder a janela ipython"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8689,16 +8516,16 @@ msgstr ""
 "'%s' não está em sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Você não tem uma conta ativa"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Parece que o Gajim não está rodando. Então você não pode usar o gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8707,16 +8534,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8725,7 +8552,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8734,7 +8561,7 @@ msgstr ""
 "Muitos argumentos. \n"
 "Digite \"%(basename)s help %(command)s\" para mais informações"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8743,7 +8570,7 @@ msgstr ""
 "Argumento \"%(arg)s\" não está especificado. \n"
 "Digite\"%(basename)s help %(command)s\" para maiores informações"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:538
 msgid "Wrong uri"
 msgstr "URI incorreta"
 
@@ -8772,12 +8599,12 @@ msgstr "Você não pode apagar o seu tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:166
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -8787,136 +8614,160 @@ msgstr ""
 msgid "Insert Nickname"
 msgstr "Inserir apelido"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Conversação com "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Conversação continuada"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1217 ../src/gui_interface.py:1052
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1220
 msgid "Room logging is enabled"
 msgstr "A gravação das conversas da sala está ligado"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1222
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1225
 msgid "The server has assigned or modified your roomnick"
 msgstr "O servidor atribuiu ou modificou o apelido da sua sala"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1235
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi chutado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1245
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1261 ../src/groupchat_control.py:1356
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1277 ../src/gui_interface.py:896
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s agora é conhecido como %(new_nick)s"
+
+#: ../src/groupchat_control.py:1315 ../src/groupchat_control.py:1319
+#: ../src/groupchat_control.py:1324
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi removido da sala (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1316
 msgid "affiliation changed"
 msgstr "filiação alterada"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1321
 msgid "room configuration changed to members-only"
 msgstr "a configuração da sala mudou para aceitar apenas membros"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1326
 msgid "system shutdown"
 msgstr "desligamento do sistema"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** A afiliação de %(nick)s foi alterada para %(affiliation)s por %(actor)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1409
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** A afiliação de %(nick)s foi alterado para %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1424
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** O cargo de %(nick)s foi definido para %(role)s por %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1428
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** O cargo de %(nick)s foi definido para %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1457
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1462
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1464 ../src/gui_interface.py:921
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s agora está %(status)s"
+
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Você tem certeza que quer deixar a conferência \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1694
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se você fechar esta janela, será desconectado desta conferência."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1698 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1935 ../src/gui_interface.py:1970
+#: ../src/message_window.py:227 ../src/roster_window.py:2675
+#: ../src/roster_window.py:3318 ../src/roster_window.py:4026
+msgid "Do _not ask me again"
+msgstr "_Não me pergunte novamente"
+
+#: ../src/groupchat_control.py:1731
 msgid "Changing Subject"
 msgstr "Mudando assunto"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1732
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1739
 msgid "Changing Nickname"
 msgstr "Mudando apelido"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1740
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique o novo apelido que você quer usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1769
 #, python-format
 msgid "Destroying %s"
 msgstr "Excluindo %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1770
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8924,22 +8775,22 @@ msgstr ""
 "Você está prestes a excluir definitivamente esta sala.\n"
 "Você deve especificar uma justificativa abaixo:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1772
 msgid "You may also enter an alternate venue:"
 msgstr "Você também pode entrar com um ponto de encontro alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1956
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1957 ../src/groupchat_control.py:2280
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2279
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -8963,90 +8814,507 @@ msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:202 ../src/gtkgui_helpers.py:217
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:393
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:396
 msgid "Error parsing file:"
 msgstr "Erro ao analisar o arquivo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:437
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Não foi possível escrever em %s. O suporte de gerência da sessão não funciona"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:806
 msgid "Gajim is not the default Jabber client"
 msgstr "O Gajim não é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:807
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Você gostaria de tornar o Gajim o cliente Jabber padrão?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:808
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Sempre verificar ao iniciar se o Gajim é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:875
 msgid "Extension not supported"
 msgstr "Extensão não suportada"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:876
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "A imagem não pode ser salva no formato %(type)s. Salvar como %(new_filename)"
 "s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:912
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:130
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"O apelido que você deseja usar na sala %s está em uso ou registado por um "
+"outro ocupante.\n"
+"Por favor, especifique um outro apelido abaixo:"
+
+#: ../src/gui_interface.py:133
+msgid "Always use this nickname when there is a conflict"
+msgstr "Sempre usar este apelido quando houver um conflito"
+
+#: ../src/gui_interface.py:150
+msgid "Do you accept this request?"
+msgstr "Você aceita a solicitação?"
+
+#: ../src/gui_interface.py:152
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Você aceita essa requisição na conta %s?"
+
+#: ../src/gui_interface.py:155
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Autorização HTTP (%(method)s) para %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:204 ../src/notify.py:519
+msgid "Connection Failed"
+msgstr "Falha na conexão"
+
+#: ../src/gui_interface.py:543 ../src/gui_interface.py:547
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Erro %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:557 ../src/gui_interface.py:571
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "erro ao enviar %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:596 ../src/notify.py:521
+msgid "Subscription request"
+msgstr "Solicitação de inscrição"
+
+#: ../src/gui_interface.py:621
+msgid "Authorization accepted"
+msgstr "Autorização aceita"
+
+#: ../src/gui_interface.py:622
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "O contato \"%s\" autorizou você para ver seu status."
+
+#: ../src/gui_interface.py:634
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Contato \"%s\" removeu sua inscrição"
+
+#: ../src/gui_interface.py:635
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Você irá sempre ver ele ou ela como desconectado.\n"
+"Você quer removê-lo ou removê-la da sua lista de contatos?"
+
+#: ../src/gui_interface.py:659 ../src/notify.py:523
+msgid "Unsubscribed"
+msgstr "Desinscrever"
+
+#: ../src/gui_interface.py:700
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Contato com \"%s\" não pode ser estabelecido"
+
+#: ../src/gui_interface.py:988
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s alterou o assunto para %(subject)s"
+
+#: ../src/gui_interface.py:1055
+msgid "Room now shows unavailable member"
+msgstr "A sala agora exibe membros indisponíveis"
+
+#: ../src/gui_interface.py:1057
+msgid "room now does not show unavailable members"
+msgstr "a sala agora não mostra membros indisponíveis"
+
+#: ../src/gui_interface.py:1060
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Uma modificação na configuração da sala que não tem relação com privacidade "
+"ocorreu"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now enabled"
+msgstr "A gravação das conversas da sala está ativo agora"
+
+#: ../src/gui_interface.py:1065
+msgid "Room logging is now disabled"
+msgstr "A gravação das conversas da sala está desligado agora"
+
+#: ../src/gui_interface.py:1067
+msgid "Room is now non-anonymous"
+msgstr "Agora a sala é não-anônima"
+
+#: ../src/gui_interface.py:1070
+msgid "Room is now semi-anonymous"
+msgstr "Agora a sala é semi-anônima"
+
+#: ../src/gui_interface.py:1073
+msgid "Room is now fully-anonymous"
+msgstr "Agora a sala é totalmente anônima"
+
+#: ../src/gui_interface.py:1105
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Uma senha é requerida para ingressar na sala %s. Por favor, digite-a."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Você configurou o Gajim para usar o agente do GPG, mas não há agente do GPG "
+"rodando ou então ele retornou uma frase secreta incorreta.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Você está atualmente conectado sem sua chave OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Sua frase de acesso está incorreta"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Frase de acesso OpenGPG incorreta"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "Chave GPG não confiável"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"A chave GPG usada para criptografar esta conversa não é confiável. Você "
+"realmente deseja criptografar esta mensagem?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"O Gnome Keyring está instalado mas não \t\t\t\tiniciou corretamente "
+"(provavelmente a variável de ambiente não \t\t\t\testá corretamente definida)"
+
+#: ../src/gui_interface.py:1290
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Novo email em %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Você tem %d nova mensagem de email"
+msgstr[1] "Você tem %d novas mensagens de email"
+
+#: ../src/gui_interface.py:1305
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"De: %(from_address)s\n"
+"Assunto: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1373
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s quer te enviar um arquivo."
+
+#: ../src/gui_interface.py:1410 ../src/roster_window.py:1824
+msgid "Remote contact stopped transfer"
+msgstr "O contato remoto parou a transferência"
+
+#: ../src/gui_interface.py:1412 ../src/roster_window.py:1826
+msgid "Error opening file"
+msgstr "Erro abrindo arquivo"
+
+#: ../src/gui_interface.py:1443
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1447
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
+
+#: ../src/gui_interface.py:1460
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Você enviou com sucesso o %(filename)s para %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1464
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Transferência de arquivo de %(filename)s para %(name)s parado."
+
+#: ../src/gui_interface.py:1573
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Não foi possível descriptografar a mensagem de %s\n"
+"Ela pode ter sido adulterada."
+
+#: ../src/gui_interface.py:1580
+msgid "Unable to decrypt message"
+msgstr "Não foi possível descriptografar a mensagem"
+
+#: ../src/gui_interface.py:1654
+msgid "Username Conflict"
+msgstr "Conflito de nome de usuário"
+
+#: ../src/gui_interface.py:1655
+msgid "Please type a new username for your local account"
+msgstr "Por favor digite um novo nome de usuário para sua conta local"
+
+#: ../src/gui_interface.py:1667
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1680
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1691
+msgid "Error."
+msgstr "Erro."
+
+#: ../src/gui_interface.py:1718
+msgid "Resource Conflict"
+msgstr "Conflito de recurso"
+
+#: ../src/gui_interface.py:1719
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Você já está conectado a essa conta com o mesmo recurso. Por favor digite um "
+"novo"
+
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1766
+#, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s quer iniciar uma conversa com voz."
+
+#: ../src/gui_interface.py:1769
+msgid "Voice Chat Request"
+msgstr "Solicitação de conversa com voz"
+
+#: ../src/gui_interface.py:1874
+msgid "Error verifying SSL certificate"
+msgstr "Erro ao verificar o certificado SSL"
+
+#: ../src/gui_interface.py:1875
+#, 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 ""
+"Ocorreu um erro ao verificar o certificado SSL do seu servidor jabber: %"
+"(error)s\n"
+"Você ainda deseja conectar-se a este servidor?"
+
+#: ../src/gui_interface.py:1880
+msgid "Ignore this error for this certificate."
+msgstr "Ignorar este erro para este certificado."
+
+#: ../src/gui_interface.py:1900
+msgid "SSL certificate error"
+msgstr "Erro de certificado SSL"
+
+#: ../src/gui_interface.py:1901
+#, python-format
+msgid ""
+"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 ""
+"Parece que o certificado SSL da conta %(account)s foi alterado ou sua "
+"conexão foi hackeada.\n"
+"Fingerprint antigo: %(old)s\n"
+"Novo fingerprint: %(new)s\n"
+"\n"
+"Você ainda quer conectar e atualizar o fingerprint do certificado?"
+
+#: ../src/gui_interface.py:1931 ../src/gui_interface.py:1966
+msgid "Insecure connection"
+msgstr "Conexão não-segura"
+
+#: ../src/gui_interface.py:1932
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Você está prestes a enviar sua senha em um conexão não-criptografada. Tem "
+"certeza que quer fazer isto?"
+
+#: ../src/gui_interface.py:1934 ../src/gui_interface.py:1969
+msgid "Yes, I really want to connect insecurely"
+msgstr "Sim, eu realmente quero me conectar de modo não-seguro"
+
+#: ../src/gui_interface.py:1967
+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 ""
+"Você está enviando sua senha em uma conexão não-segura. Você deve instalar o "
+"PyOpenSSL para prevenir isto. Você tem certeza que quer fazer isso?"
+
+#: ../src/gui_interface.py:1987
+msgid "PEP node was not removed"
+msgstr "O nó PEP não foi removido"
+
+#: ../src/gui_interface.py:1988
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "O nó PEP %(node)s não foi removido: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2546 ../src/gui_interface.py:2568
+msgid "Emoticons disabled"
+msgstr "Emoticons desabilitados"
+
+#: ../src/gui_interface.py:2547
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Você configurou um tema de emoticons que não foi encontrado, então os "
+"emoticons estão desativados."
+
+#: ../src/gui_interface.py:2569
+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 ""
+"Você configurou um tema de emoticons que não podem ser carregados. Você pode "
+"precisar atualizar o formato do arquivo emoticons.py. Veja http://trac.gajim."
+"org/wiki/Emoticons para mais detalhes."
+
+#: ../src/gui_interface.py:2597 ../src/roster_window.py:3474
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2964
+msgid "Could not save your settings and preferences"
+msgstr "Impossível salvar suas preferências"
+
+#: ../src/gui_interface.py:3461
+msgid "Passphrase Required"
+msgstr "Frase de acesso é obrigatória"
+
+#: ../src/gui_interface.py:3462
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr ""
+"Entre com a frase de acesso da chave GPG %(keyid)s para conta (account %"
+"(account)s)."
+
+#: ../src/gui_interface.py:3476
+msgid "GPG key expired"
+msgstr "A chave GPG expirou"
+
+#: ../src/gui_interface.py:3477
+#, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Sua chave GPG expirou, você será conectado ao %s sem OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3486
+msgid "Wrong Passphrase"
+msgstr "Frase de acesso errada"
+
+#: ../src/gui_interface.py:3487
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Por favor, reescreva sua frase secreta de GPG ou pressione Cancelar."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Nova conferência"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à minha lista"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Contatos"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Apelido"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9054,7 +9322,7 @@ msgstr ""
 "Você quer limpar o banco de dados? (ALTAMENTE NÃO RECOMENDADO COM O GAJIM EM "
 "EXECUÇÃO)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 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 "
@@ -9068,235 +9336,239 @@ msgstr ""
 "\n"
 "Se caso você clicou SIM, por favor espere... "
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Exportando histórico de logs..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s em %(time)s disse: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:572
 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] "Você realmente quer excluir os logs do contato selecionado?"
 msgstr[1] "Você realmente quer excluir os logs dos contatos selecionados?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Esta é uma operação irreversível."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Você realmente quer excluir a mensagem selecionada?"
 msgstr[1] "Você realmente quer excluir as mensagens selecionadas?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversação com %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Erro de disco"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s é agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Mensagem de erro: %s"
+msgstr "Erro: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Erro."
+msgstr "Erro"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status agora é: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Tempo esgotado ao carregar a imagem"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "A imagem é grande demais"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
 msgstr "Você está prestes a fechar todas as abas"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
 msgstr "Você realmente deseja fechar todas?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Conversas"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Conferências"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Conversas privadas"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- as mensagens serão gravadas"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- as mensagens não serão gravadas"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s alterou seu status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectou"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectou"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:277
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova mensagem simples de %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:284
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensagem privada da conferência %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:286
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:289
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensagem enviada por %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:294
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mensagem de %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:561
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2862
 msgid "File is empty"
 msgstr "O arquivo está vazio"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2865
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2867 ../src/roster_window.py:2878
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informação recebida"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Você deve estar conectado para publicar suas informações de contato."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Enviando perfil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informação NÃO publicada"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:282 ../src/roster_window.py:1023
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1886
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1887
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1909
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o status dele ou dela."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1924
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1925
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1953
 msgid "GPG is not usable"
 msgstr "GPG não é usável"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1954
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Você será conectado ao %s sem OpenPGP."
+
+#: ../src/roster_window.py:2163 ../src/roster_window.py:3411
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2164 ../src/roster_window.py:3412
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9304,28 +9576,27 @@ msgstr ""
 "Mudando seu status para invisível resulta na desconexão daquelas "
 "conferências. Você tem certeza que quer ir invisível?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2190
 msgid "desync'ed"
 msgstr "não sincronizado"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2251
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Realmente sair do Gajim?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2252
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Você tem certeza que quer deixar a conferência \"%s\"?"
+msgstr "Você tem certeza que deseja sair?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2253
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Sempre fechar o Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2348 ../src/roster_window.py:2593
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2349
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9333,16 +9604,16 @@ msgstr ""
 "Mensagens somente estarão disponíveis para leitura mais tarde se você tiver "
 "o histórico habilitado e contato na sua lista."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2594
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2597
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2598
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9350,11 +9621,11 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2601
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2606
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9363,69 +9634,70 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens para contatos destes "
 "transportes: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2670
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
-"Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
+"Você está prestes a bloquear um contato. Tem certeza que quer continuar?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2672
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Este contato irá ver você desconectado e você não irá receber mensagens que "
+"ele enviar para você."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2758
 msgid "Rename Contact"
 msgstr "Renomear contato"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2759
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2766
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2767
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2808
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2809
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Você quer remover o grupo %s da lista?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2810
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Também remove todos os contatos neste grupo da sua lista"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2849
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2850
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3227
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3229
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Você realmente deseja remover \"%(name)s\" (%(jid)s) da sua lista.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3234
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9434,11 +9706,11 @@ msgstr ""
 "ele ou ela sempre o verá offiline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3240
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3243
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9446,16 +9718,16 @@ msgstr ""
 "Removendo este contato, você também, por padrão, removerá a autorização, "
 "resultando em ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3246
 msgid "I want this contact to know my status after removal"
 msgstr "Eu quero que este contato saiba meu status após a remoção"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3250
 msgid "Contacts will be removed from your roster"
 msgstr "Os contatos serão removidos da sua lista"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3255
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9465,34 +9737,36 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3312
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
+"Você está prestes a enviar um status customizado. Tem certeza que quer "
+"continuar?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3314
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Este contato irá temporariamente ver você como %(status)s, mas somente até "
+"você alterar o seu status. Então ele irá ver o seu status global."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3333
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3334
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Você deve configurar uma conta antes de poder conversar com outros contatos."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3930
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3932
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9500,13 +9774,13 @@ msgstr ""
 "O seu servidor não suporta a gravação de informação de metacontatos, então "
 "essas informações não estarão salvas na próxima vez que você conectar."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:4020
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:4022
 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 "
@@ -9516,23 +9790,23 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4137
 msgid "Invalid file URI:"
 msgstr "Arquivo URI inválido:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4148
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Você quer enviar este arquivo para %s:"
 msgstr[1] "Você quer enviar estes arquivos para %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4263
+#, python-format
 msgid "Send %s to %s"
-msgstr "Enviar %s"
+msgstr "Enviar %s para %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4269
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Fazer %s e %s metacontatos"
@@ -9542,157 +9816,161 @@ msgstr "Fazer %s e %s metacontatos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4707 ../src/roster_window.py:4778
+#: ../src/roster_window.py:4787 ../src/statusicon.py:245
+#: ../src/statusicon.py:292 ../src/statusicon.py:298
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4794
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4799
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4836 ../src/statusicon.py:308
 msgid "_Manage Bookmarks..."
 msgstr "_Gerenciar marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4856
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4896
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4952 ../src/roster_window.py:5055
 msgid "_Change Status Message"
 msgstr "_Mudar mensagem de status"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4984
 msgid "Publish Tune"
 msgstr "Publicar sintonia"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4986
+#, fuzzy
+msgid "Publish Location"
+msgstr "Publicar sintonia"
+
+#: ../src/roster_window.py:4989
 msgid "Configure Services..."
 msgstr "Configurar serviços..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5133
 msgid "_Maximize All"
 msgstr "_Maximizar tudo"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5309
 msgid "Send Group M_essage"
 msgstr "Enviar m_ensagem de grupo"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5149
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5153
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5329
 msgid "_Manage Contacts"
 msgstr "_Gerenciar contatos"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5337
 msgid "Edit _Groups"
 msgstr "Editar _grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5392
 msgid "Send Single Message"
 msgstr "Enviar mensagem simples"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5438
 msgid "Execute Command..."
 msgstr "Executar comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5448
 msgid "_Manage Transport"
 msgstr "_Gerenciar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5456
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5465
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5526
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5534
 msgid "_Reconnect"
-msgstr "_Desconectar"
+msgstr "_Reconectar"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5540
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5622
 msgid "History Manager"
 msgstr "Gerenciador de histórico"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5633
 msgid "_Join New Group Chat"
 msgstr "_Ingressar em uma nova Conferência"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5800
 msgid "Change Status Message..."
 msgstr "Mudar mensagem de status..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Esperando resultados"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Erro no formulário de dados recebido"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Sem resultados"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Erro ao escrever em disco"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Assunto: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Confirme essas opções de sessão"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9707,7 +9985,7 @@ msgstr ""
 "\n"
 "\tEssas opções são aceitáveis?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9722,116 +10000,121 @@ msgstr ""
 "\n"
 "Continuar com a sessão?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Mudar mensagem de status..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:322
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dessa sala"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [bloqueado]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimizado]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Último status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Inscrição: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Sintonia:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Notificação"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Parado"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Completo"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?status da transferência:Parado"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Parado"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço não respondeu ainda com informação detalhada"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9839,28 +10122,28 @@ msgstr ""
 "Este serviço não pode responder com informações detalhadas.\n"
 "É provável que esteja quebrado"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Tempo:Desconhecido"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliação:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9868,7 +10151,7 @@ msgstr ""
 "Este contato está interessado em sua informação de presença, mas você não "
 "está interessado na presença dele/dela"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9876,13 +10159,13 @@ msgstr ""
 "Você está interessado na informação da presença do contato, mas ele/ela não "
 "está interessado na sua"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Você e o contato estão interessados na informação da presença de cada um"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9890,19 +10173,81 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum outro está "
 "interessado no seu"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Você está esperando a resposta do contato sobre seu pedido de inscrição"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Não há requisições de inscrições pendentes."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
+#~ msgid "Wrong host"
+#~ msgstr "Servidor errado"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Endereço local inválido? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "O pysqlite2 (ou python-pysqlite2) está faltando. Encerrando..."
+
+#~ msgid "_Incoming message:"
+#~ msgstr "Mensagem _recebida:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "Mensagem _enviada:"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "O computador %s que você especificou na configuração avançada "
+#~ "ft_override_host_to_send não é válido e será ignorado."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Frase de acesso do OpenPGP não foi recebida"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Para continuar enviando e recebendo mensagens, você precisará reconectar."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Você não está conectado ou não está visível aos outros. Sua mensagem não "
+#~ "pode ser enviada."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Esta mensagem está criptografada]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i dias atrás"
+
+#~ msgid "Trayicon"
+#~ msgstr "Ícone da bandeja"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Um ícone na bandeja do sistema refletindo a presença atual."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Requer python-gnome2-extras ou módulo trayicon compilado a partir dos "
+#~ "fontes do Gajim."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Requer PyGTK >= 2.10."
+
 #~ msgid "Enable link-local/zeroconf messaging"
 #~ msgstr "Ativar mensagens \"link-local\"/\"zeroconf\""
 
diff --git a/po/ru.po b/po/ru.po
index b0d993307..1529336d2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-20 00:02+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-10-30 01:02+0300\n"
 "Last-Translator: Fomin Denis <fominde@mail.ru>\n"
 "Language-Team: Русский <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -112,9 +112,8 @@ msgstr ""
 "Отпечаток SHA1 сертификата:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Использовать прокси аут_ентификацию"
+msgstr "Анонимная аут_ентификация"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -289,9 +288,9 @@ msgstr "Редактировать личную информацию..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -300,9 +299,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Общие"
 
@@ -362,21 +361,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Информация о вас, сохраненная на сервере"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Нет"
 
@@ -491,9 +490,8 @@ msgid "Accounts"
 msgstr "Учётные записи"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Использовать прокси аут_ентификацию"
+msgstr "Анонимная аутентификация"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -532,8 +530,8 @@ msgstr ""
 "Также, возможно, придется изменить некоторые настройки брандмауэра."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -547,7 +545,7 @@ msgid "Mer_ge accounts"
 msgstr "_Объединить учетные записи"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "П_ереименовать"
 
@@ -947,7 +945,7 @@ msgstr "Последнее изменение:"
 msgid "New entry received"
 msgstr "Получена новая запись"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Получена новая запись:"
 
@@ -991,11 +989,11 @@ msgstr "Введите новый пароль"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Введите ваше новое сообщение о статусе</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Занятие:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Настроение:"
 
@@ -1075,9 +1073,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Назначить ключ Open_PGP"
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Выполнить команду..."
+msgstr "В_ыполнить команду..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1085,8 +1082,8 @@ msgstr "Редактировать _группы"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
@@ -1099,8 +1096,8 @@ msgid "Remo_ve"
 msgstr "_Удалить"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Установи_ть статус"
 
@@ -1133,8 +1130,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Позволить ему или ей видеть мой статус"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Блокировать"
 
@@ -1145,7 +1142,7 @@ msgstr "_Запретить ему или ей видеть мой статус"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_История"
 
@@ -1166,8 +1163,8 @@ msgid "_Subscription"
 msgstr "_Подписка"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Разблокировать"
 
@@ -1255,7 +1252,7 @@ msgstr ""
 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:820
 msgid "_Continue"
 msgstr "_Продолжить"
 
@@ -1263,7 +1260,7 @@ msgstr "_Продолжить"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомить меня, когда передача файлов закончится"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Открыть папку с принятым файлом"
 
@@ -1291,7 +1288,7 @@ msgstr ""
 "Контакт\n"
 "Баннер в окне чата"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Полужирный"
 
@@ -1311,11 +1308,11 @@ msgstr "Настройка тем для Gajim"
 msgid "Gone"
 msgstr "Ушел"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Неактивен"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1361,7 +1358,7 @@ msgstr "Изменить _тему"
 msgid "Configure _Room..."
 msgstr "Настроить _комнату"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "Добавить эту комнату в _закладки"
 
@@ -1450,8 +1447,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добро пожаловать в менеджер истории Gajim'а</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1482,7 +1480,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Поиск в базе данных"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "История"
 
@@ -1506,11 +1504,10 @@ msgid "_Log conversation history"
 msgstr "_История сообщения"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "Добавить комнату в закладки (Ctrl+B)"
+msgstr "Добавить комнату в закладки"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Войти в комнату"
 
@@ -1537,8 +1534,8 @@ msgstr "Недавно:"
 msgid "Room:"
 msgstr "Комната:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Присоединиться"
 
@@ -1566,7 +1563,7 @@ msgstr "Сворачивать при автовходе"
 msgid "Print status:"
 msgstr "Показывать статус:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -1677,17 +1674,26 @@ msgid "Show a list of formattings"
 msgstr "Показать список форматирования"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Показать меню дополнительных функций (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Показать информацию о контакте (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Отправить"
 
@@ -1801,7 +1807,7 @@ msgstr ""
 "Определять автоматически при каждом запуске Gajim\n"
 "Всегда использовать приложения GNOME по умолчанию\n"
 "Всегда использовать приложения KDE по умолчанию\n"
-"Всегда использовать приложения XFCE4 по умолчанию\n"
+"Всегда использовать приложения Xfce по умолчанию\n"
 "Другое"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1818,6 +1824,16 @@ msgid "Configure color and font of the interface"
 msgstr "Настроить цвет и шрифт интерфейса"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Сообщение чата:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Имя контакта"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1831,31 +1847,31 @@ msgstr ""
 "Отдельно ростер и окна чатов сгруппированных по учетной записи\n"
 "Отдельно ростер и окна чатов сгруппированных по типу"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Показывать _занятия контактов в ростере"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Отображать _дополнительные данные о почте"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Отмечать контакты, слушающие музыку (tunes)"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показывать а_ватары для контактов в ростере"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Показывать на_строения для контактов в ростере"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Показывать _сообщения о статусе контакта в ростере"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1865,7 +1881,7 @@ msgstr ""
 "Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне "
 "чата."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1875,7 +1891,7 @@ msgstr ""
 "контактом. Здесь вы можете указать, какие состояния чата Gajim будет "
 "отсылать вашему респонденту."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1883,33 +1899,33 @@ msgstr ""
 "Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Не показывать кнопки в окнах чата"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr ""
-"Если отмечено, то Gajim будет разрешать определять операционную систему "
+"Если отмечено, то Gajim будет разрешать определять операционную систему, "
 "которую вы используете"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Если отмечено, то Gajim изменит статус на Away, если компьютер не "
 "используется."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1917,7 +1933,7 @@ msgstr ""
 "Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго "
 "не используется"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1925,7 +1941,7 @@ msgstr ""
 "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и "
 "в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1933,25 +1949,25 @@ msgstr ""
 "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
 "его именем в окне ростера и в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Если отмечено, то Gajim будет показывать занятия контактов в окне ростера"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Если отмечено, то Gajim будет показывать tunes контактов в окне ростера"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1961,7 +1977,7 @@ msgstr ""
 "окон чата. Если язык проверки явно не задан, будет использован язык по "
 "умолчанию для данного контакта или комнаты."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1971,7 +1987,7 @@ msgstr ""
 "вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
 "от контактов не из вашего ростера."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1981,14 +1997,14 @@ msgstr ""
 "Помните, что при использовании E2E шифрования удаленная сторона должна дать "
 "согласие на ведение истории, иначе сообщения не будут сохраняться."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 "Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -1998,7 +2014,7 @@ msgstr ""
 "(например, контакты из MSN будут иметь соответствующие иконки msn для "
 "статусов «в сети», «ушёл», «занят» и т.д.)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2006,7 +2022,7 @@ msgstr ""
 "Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него "
 "будет использовано соответствующее сообщение по умолчанию."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2014,19 +2030,19 @@ msgstr ""
 "Gajim заменяет текстовые смайлики, например ':)', их графическим или "
 "анимированным эквивалентом. Выберите «Отключены», чтобы этого не происходило."
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Записывать в лог _шифрованные сообщения"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "_Компактное окно сообщений"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "_Управление..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
@@ -2036,31 +2052,31 @@ msgstr ""
 "Только при пропущенных событиях\n"
 "Всегда"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Уведомлять о контактах, которые _вошли: "
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Уведомлять о контактах, которые _вышли: "
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Сообщать о новых письмах в _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Расширенные статусы"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2070,23 +2086,23 @@ msgstr ""
 "Сообщить мне об этом\n"
 "Показать в ростере"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
 msgstr "Показывать иконку в системном лотке:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "В_ошел"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "В_ышел"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2094,27 +2110,27 @@ msgstr ""
 "Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). "
 "Если отмечено, Gajim будет отображать только их текст, без форматирования."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Сортировать контакты по статусу"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Тема статусных _иконок:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Стиль"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2126,7 +2142,7 @@ msgstr ""
 "$S заменяется на предыдущее сообщение о статусе\n"
 "$T заменяется на время срабатывания автоматического сообщения о статусе «Ушел»"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2139,103 +2155,105 @@ msgstr ""
 "$T заменяется на время срабатывания автоматического сообщения о статусе "
 "«Недоступен»"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Использовать иконки _транспортов"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Использовать _системный шрифт"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Когда получено новое сообытие:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Сообщение об ошибке: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Ник:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "Авто-_отошел после:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "_Отображать уведомления о состоянии чата:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Смайлики:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Менеджер файлов:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Игнорировать форматирование во входящих сообщениях"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Входящее сообщение:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Записывать в лог изменения статусов контактов"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Почтовый клиент:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "Авто-_недоступен после:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Открыть..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Исходящее сообщение:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Вернуться к цветам по умолчанию"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "_Отправлять уведомления о состоянии чата:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Сообщение о статусе:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "_Цвет ссылок:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "Поведение _окна:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "в _комнатах"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "в _ростере"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "минут"
 
@@ -2268,9 +2286,8 @@ msgid "All"
 msgstr "всем"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "всем с подпиской"
+msgstr "Все (включая подписку)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2288,7 +2305,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Номер:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Список доступа"
 
@@ -2432,7 +2449,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Префикс:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Обязанности:</b>"
 
@@ -2492,8 +2509,8 @@ msgstr "Удалить учетную запись из Gajim и с _серве�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Удалить"
 
@@ -2502,22 +2519,27 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>someone@somewhere.com</b> хочет <b>добавить</b> несколько контактов в ваш "
+"список контактов."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
+"Тело сообщения <в данное время не используется, поэтому по умолчанию не "
+"отображается>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Обмен контактами"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_ОК"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-ok"
-msgstr "gtk-ok"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2574,7 +2596,7 @@ msgstr "_Действия"
 msgid "_Contents"
 msgstr "_Содержание"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Правка"
 
@@ -2615,11 +2637,11 @@ msgid "_Add contact"
 msgstr "Добавить _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Информация о контакте"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Поиск"
 
@@ -2639,10 +2661,6 @@ msgstr "Зарегистрировать в"
 msgid "_Cancel"
 msgstr "О_тменить"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_ОК"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2847,282 +2865,268 @@ msgstr "Ресурс:"
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Отменить подтверждение"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 "Команда находится в процессе выполнения. Вы уверены, что хотите её отменить?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Сервис отправил недопустимые данные"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Сервис изменил идентификатор сеанса."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Сервис ответил ошибкой."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Активно"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Неактивно"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Булево"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Целое"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Цвет"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Название опции"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Значение"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Нет)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Скрытый"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Получена новая запись:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Вы получили новые записи (и %(count)d не отображается):"
+msgstr[1] "Вы получили новые записи (и %(count)d не отображается):"
+msgstr[2] "Вы получили новые записи (и %(count)d не отображается):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Английский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Белорусский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Болгарский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Бретонский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Чешский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Немецкий"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Греческий"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Британский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Испанский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Баскский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Французский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Хорватский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Норвежский (букмол)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Голландский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Польский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Португальский (Бразилия)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Русский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Сербский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Словацкий"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Шведский"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Китайский"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Язык проверки орфографии"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 msgid "Underline"
 msgstr "Подчеркнутый"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 msgid "Strike"
 msgstr "Зачеркнутый"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 msgid "Clear formating"
 msgstr "Удалить форматирование"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Отправить файл?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Если вы пошлете файл %s, он/она узнает ваш настоящий Jabber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG шифрование включено"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
 msgstr "Этот контакт не поддерживает передачу файлов."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Необходимо знать настоящий JID контакта для того, чтобы отправить ему или ей "
 "файл."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Неизвестный исполнитель"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Неизвестная песня"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Неизвестный альбом"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>«%(title)s»</b> <i>%(artist)s</i>\n"
-"из <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, 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:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Ключ GPG не присвоен"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3130,50 +3134,50 @@ msgstr ""
 "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
 "сообщения с помощью GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG шифрование выключено"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Для сеанса БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "было"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "НЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "будет"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "НЕ будет"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "и заверено"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 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:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3182,23 +3186,23 @@ msgstr ""
 "%(type)s шифрование %(status)s включено %(authenticated)s.\n"
 "Для сеанса %(logged)s сохранена история сообщений."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Установление сеанса отменено"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Сеанс зашифрован"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr " и БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr " и НЕ БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3206,25 +3210,25 @@ msgstr ""
 "Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для "
 "подробностей."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E шифрование выключено"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Последнее сообщение зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Получено новое сообщение от «%s»"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3232,15 +3236,15 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3249,7 +3253,7 @@ msgstr ""
 "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
 "или удалить (вся история будет утеряна)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s теперь %(status)s"
@@ -3258,23 +3262,23 @@ msgstr "%(name)s теперь %(status)s"
 msgid "creating logs database"
 msgstr "создается БД истории"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s должен быть директорией, а не файлом"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Закончить работу"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s должен быть файлом, а не директорией"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "создается директория %s"
@@ -3337,10 +3341,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Выберите конференции, которые вы хотите покинуть"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Комнаты"
 
@@ -3397,53 +3401,48 @@ msgstr "$S будет замещено текущим сообщением о с
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
-"Когда показывать иконку в системном лотке. Возможные значения  'never', "
+"Когда показывать иконку в системном лотке. Возможные значения 'never', "
 "'on_event', 'always'."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Неверное имя пользователя"
+msgstr "Цвет ника собеседника."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Цвет вашего ника."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Цвет входящих сообщений."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Цвет исходящих сообщений."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "текст сообщения о статусе"
+msgstr "Цвет сообщения о статусе."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Неверное имя пользователя"
+msgstr "Шрифт ника собеседника."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Смена ника"
+msgstr "Шрифт вашего ника."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Шрифт входящих сообщений."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Шрифт исходящих сообщений."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "текст сообщения о статусе"
+msgstr "Шрифт сообщения о статусе"
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3452,9 +3451,9 @@ msgstr ""
 "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "По_умолчанию"
 
@@ -3557,17 +3556,22 @@ msgstr "Сколько минут должны оставаться послед
 
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
-msgstr ""
+msgstr "Количество строк истории сообщений, запрашиваемых при входе в комнату."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr ""
+"За какой период (минут назад) запрашивать историю сообщений при входе в "
+"комнату."
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Время ожидания в секундах перед попыткой снова автоматически войти в "
+"комнату, от которой вы были отключены. Чтобы отключить автоматический вход в "
+"этом случае, установите значение 0."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3887,7 +3891,7 @@ msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
-"Список цветов, разделенных  «:» которые будут использоваться для раскраски "
+"Список цветов, разделенных «:», которые будут использоваться для раскраски "
 "ников в комнатах."
 
 #: ../src/common/config.py:255
@@ -3905,21 +3909,19 @@ msgstr ""
 "строка означает, что сообщение не будет показываться вообще."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
+"Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
+"Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
 #: ../src/common/config.py:259
@@ -3942,12 +3944,11 @@ msgstr ""
 "хранения паролей учетных записей."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Если активно, Gajim будет использовать (если возможно) Gnome Keyring для "
+"Если активно, Gajim будет использовать (если возможно) KDE Wallet для "
 "хранения паролей учетных записей."
 
 #: ../src/common/config.py:262
@@ -4030,12 +4031,17 @@ msgstr ""
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Если Активно, автодополнение ников в конференциях будет работать как "
+"автодополнение в командной оболочке"
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"В каких случаях показывать список своих собственных контактов. Может "
+"принимать значения «always» (всегда), «when_other_resource» (если другой "
+"ресурс) и «never» (никогда)."
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4061,12 +4067,15 @@ msgstr "Если включено, восстанавливать последн
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
+"Если активно, контакты, запрашивающие авторизацию, будут автоматически её "
+"получать."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
-msgstr "Если неактивно, вы больше не будете видеть аватары в окне беседы."
+msgstr ""
+"Если неактивно, эта учетная запись будет отключена и не будет отображаться в "
+"окне ростера."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4129,7 +4138,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Костыль для jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4137,15 +4146,15 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Отвечать на запросы уведомления"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Посылать запросы уведомления"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4153,11 +4162,11 @@ msgstr ""
 "Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что "
 "вы хотите сохранить историю сообщений?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Используется ли для этого контакта OpenPGP?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4165,101 +4174,101 @@ msgstr ""
 "Должен ли Gajim по возможности автоматически начинать для данного контакта "
 "зашифрованный сеанс?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Язык, который используется при проверке правописания"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "все или статусы, разделенные пробелом"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "«yes» (да), «no» (нет) или «both» (оба)"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "«yes» (да), «no» (нет) или «» (пусто)"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "В кино"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Работаю"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Я здесь."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Скоро буду."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Меня нет."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4268,98 +4277,97 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "овощной"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "телесный"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "морской"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Не могу загрузить модуль «idle»"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Неверный хост"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Неправильный локальный адрес? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Данные о регистрации для транспорта %s не пришли вовремя."
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
 msgstr "Регистрация завершена"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Регистрация сервиса %s завершена успешно"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
 msgstr "Ошибка регистрации"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Регистрация сервиса %(agent)s завершилась ошибкой: %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Ошибка записи на диск"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Невидимость не поддерживается"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Учетная запись %s не поддерживает невидимость."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Было получено сообщение от неверного JID, оно было проигнорировано."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4369,7 +4377,7 @@ msgstr ""
 "(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история "
 "будет утеряна)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Ник недопустим: %s"
@@ -4377,76 +4385,76 @@ msgstr "Ник недопустим: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Не получается войти в комнату"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Было достигнуто максимальное количество пользователей %s"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вам запрещено входить в комнату %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Комнаты %s не существует."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Создание комнат запрещено."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Необходимо использовать ваш зарегистрированный ник в комнате %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, 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:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Комната была удалена"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Взамен, вы можете присоединиться к комнате: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "теперь мы подписались на %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s хочет отменить подписку"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "теперь мы отписались от %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4584,77 +4592,105 @@ msgstr "Назначение ключа не включает подписыва
 msgid "Application verification failure"
 msgstr "Ошибка при проверке приложения"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, 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:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Ни удаленное присутствие не подписано, ни ключ не присвоен."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "Ключ (%s) контакта не соответствует ключу, присвоенному в Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Это сообщение *зашифровано* (см. :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Тема: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с учетной записью «%s» была потеряна"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Переподключаться вручную."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s предоставил другую регистрационную форму"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестная ошибка SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Неверный ответ"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с «%s»"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер ответил: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Соединение с прокси разорвалось"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не могу соединиться с %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Связь с учетной записью %s была потеряна.Попытка подключения."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достоверность сертификата %s может быть недействительной."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4663,7 +4699,7 @@ msgstr ""
 "\n"
 "Ошибка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4672,24 +4708,24 @@ msgstr ""
 "\n"
 "Неизвестная ошибка SSL: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с «%s»"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Проверьте правильность логина и пароля."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Ошибка при удалении списка доступа"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4698,77 +4734,44 @@ msgstr ""
 "Список доступа %s не может быть удален. Возможно, он используется одним из "
 "ваших активных ресурсов. Отключите ресурс и попробуйте снова."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Не удалось передать сообщение %s — этот JID неверен."
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Ни удаленное присутствие не подписано, ни ключ не присвоен."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Ключ (%s) контакта не соответствует ключу, присвоенному в Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Это сообщение *зашифровано* (см. :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Тема: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Контакт для отправки: «%s» (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Пригласить _участников"
+msgstr "Контакты для отправки:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Нельзя получить из-за невидимости"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Ошибка регистрации"
+msgstr "Ошибка отказа от регистрации"
 
-#: ../src/common/connection.py:1983
-#, fuzzy, python-format
+#: ../src/common/connection.py:2107
+#, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
-"Регистрация сервиса %(agent)s завершилась ошибкой: %(error)s: %(error_msg)s"
+"Отказ от регистрации на сервере %(server)s завершился ошибкой: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Транспорты"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Не в ростере"
 
@@ -4784,7 +4787,7 @@ msgstr "Возможности работы Gajim с D-Bus не могут бы�
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus работает не верно на этом компьютере"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -4868,34 +4871,34 @@ msgid "%(0)s o'clock"
 msgstr "%(0)s"
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy, python-format
+#, python-format
 msgid "five past %(0)s"
-msgstr "пять минут %(1)s"
+msgstr "пять минут %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy, python-format
+#, python-format
 msgid "ten past %(0)s"
-msgstr "десять минут %(1)s"
+msgstr "десять минут %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "quarter past %(0)s"
-msgstr "четверть %(1)s"
+msgstr "четверть %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "twenty past %(0)s"
-msgstr "двадцать минут %(1)s"
+msgstr "двадцать минут %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy, python-format
+#, python-format
 msgid "twenty five past %(0)s"
-msgstr "двадцать пять минут %(1)s"
+msgstr "двадцать пять минут %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "half past %(0)s"
-msgstr "половина %(1)s"
+msgstr "половина %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
 #, python-format
@@ -5015,7 +5018,7 @@ msgstr "Готов поболтать"
 msgid "_Available"
 msgstr "_Доступен"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Доступен"
 
@@ -5133,48 +5136,48 @@ msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5182,22 +5185,22 @@ msgstr[0] "%d пропущенное сообщение"
 msgstr[1] "%d пропущенных сообщения"
 msgstr[2] "%d пропущенных сообщений"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " в комнате %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " от пользователя %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5205,7 +5208,7 @@ msgstr[0] "%d событие пропущено"
 msgstr[1] "%d события пропущено"
 msgstr[2] "%d событий пропущено"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim — %s"
@@ -5221,16 +5224,16 @@ msgid "%s is not a valid loglevel"
 msgstr "%s не является допустимым loglevel"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "синий"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "переносим журнал на индексы"
 
@@ -5239,634 +5242,655 @@ msgstr "переносим журнал на индексы"
 msgid "XMPP account %s@%s"
 msgstr "XMPP учетная запись %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Испуганный"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Изумлённый"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Влюбчивый"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Сердитый"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Раздражённый"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Озабоченный"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Возбуждённый"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Пристыженный"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Скучающий"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Храбрый"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Невозмутимый"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Осторожный"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Мерзнущий"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Уверенный"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Смущенный"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Задумчивый"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Довольный"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Раздражительный"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Сумасшедший"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Творческий"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Любознательный"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Удрученный"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Подавленный"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Разочарованный"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Чувствующий отвращение"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Потрясенный"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Растерянный"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Смущенный"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Завистливый"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Взволнованный"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Кокетливый"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Неудовлетворенный"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Признательный"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Скорбящий"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Сердитый"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Виноватый"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Счастливый"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Надеющийся"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Жарко"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Скромный"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Униженный"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Голодный"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Раненый"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Впечатлённый"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Благоговеющий"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Влюблённый"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Возмущённый"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Заинтересованный"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Пьяный"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Непобедимый"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Ревнивый"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Одинокий"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Потерянный"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Удачливый"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Подлый"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Капризный"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Нервный"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Нейтральный"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Обиженный"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Оскорбленный"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Игривый"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Гордый"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Расслабленный"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Облегчённый"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Раскаявшийся"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Неугомонный"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Грустный"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Язвительный"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Удовлетворенный"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Серьёзный"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Шокированный"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Застенчивый"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Больной"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Сонный"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Спонтанный"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Напряженный"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Сильный"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Удивлённый"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Благодарный"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Жаждущий"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Усталый"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Неопределенный"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Слабый"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Волнующийся"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Занимаюсь хозяйством"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Покупаю продукты"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Делаю уборку"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Готовлю"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Ремонт"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Мою посуду"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Стираю"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Работаю в саду"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Ушёл по поручению"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Гуляю с собакой"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Пью"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Пью пиво"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Пью кофе"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Пью чай"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Перекусываю"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Завтракаю"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Обедаю"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Ланч"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Занимаюсь спортом"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "На велосипеде"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Танцы"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "В походе"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Пробежка"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Спортивные игры"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Бегу"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Катаюсь на лыжах"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Плаваю"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Тренировка"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Уход за собой"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "В spa салоне"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Чищу зубы"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Делаю прическу"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Бреюсь"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Принимаю ванну"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Принимаю душ"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Встреча"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Выходной день"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Гуляю"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Прячусь"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Молюсь"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Запланированный отпуск"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Размышления"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Отдыхаю"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Рыбалка"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Играю"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Вышел"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "На вечеринке"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Читаю"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Репетиция"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Покупки"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Курю"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Общаюсь"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Загораю"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Смотрю ТВ"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Смотрю кино"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Разговариваю"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "В реальной жизни"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Говорю по телефону"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Говорю по видео телефону"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Путешествую"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Еду с работы/на работу"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Вождение"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "В машине"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "В автобусе"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "В самолёте"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "В поезде"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "В поездке"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Прогулка"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Пишу программу"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "На совещании"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Учусь"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Пишу"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Неизвестный исполнитель"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Неизвестная песня"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Неизвестный альбом"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>«%(title)s»</b> <i>%(artist)s</i>\n"
+"из <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5889,37 +5913,12 @@ msgstr ""
 "[Это часть зашифрованного сообщения. Если вы видите это сообщение, возможно, "
 "произошла ошибка.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Хост %s, который настроен как ft_add_hosts_to_send, не действителен, поэтому "
-"игнорируется."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Не задана парольная фраза OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Вы будете подключены к %s без использования OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Требуется переподключение для продолжения приема и отправки сообщений."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Ошибка Avahi"
 
 # link-local это вроде не просто локальный. http://en.wikipedia.org/wiki/Link-local_address
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5928,52 +5927,44 @@ msgstr ""
 "%s\n"
 "Возможно, обмен локальными сообщениями работает не верно."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 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:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Не могу запустить локальный сервис"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, 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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Удостоверьтесь, что демон avahi запущен."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не могу изменить статус учётной записи «%s»"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Вы не подключены или невидимы для других. Ваше сообщение нельзя отправить."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Это сообщение зашифровано]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Ваше сообщение не может быть отправлено."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт не в сети. Отправить сообщение не удалось."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Не удалось соединиться с хостом: истекло время ожидания."
@@ -5984,24 +5975,24 @@ msgstr "Не удалось соединиться с хостом: истекл
 msgid "Error while adding service. %s"
 msgstr "Ошибка при добавлении службы. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Отключены"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Сообщение по умолчанию"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Нет словаря для языка %s"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6010,217 +6001,216 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "заголовок сообщения о статусе"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "текст сообщения о статусе"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Если вы хотите, чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "Невозможно использовать OpenPGP на этом компьютере"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Непросмотренные события"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Это имя уже используется в другой вашей учетной записи. Выберите другое."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Переименовать учетную запись"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введите новое название для учетной записи %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат «имя_пользователя@сервер»."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP."
+msgstr "Нет секретного ключа OpenPGP."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Выбор ключа OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Чтобы отредактировать личную информацию, нужно подключиться к серверу."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "Для смены имени учетной записи необходимо отключиться."
+msgstr ""
+"Чтобы отключить эту учетную запись, необходимо отсоединиться от сервера."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Список администраторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6228,11 +6218,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6240,11 +6230,11 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6252,11 +6242,11 @@ msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6264,7 +6254,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6280,58 +6270,59 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Все"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Нет"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Новая комната"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6339,30 +6330,27 @@ msgstr ""
 "эту закладку."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Ник недопустим: %s"
+msgstr "Символ недопустим"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Неверный сервер"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Неверная запись"
+msgstr "Неверная комната"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6372,32 +6360,32 @@ msgstr ""
 "«Дополнительно», или сделать это позже посредством пункта «Учетные записи» "
 "меню «Правка» в главном окне программы."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Сертификат уже находится в файле"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6412,7 +6400,7 @@ msgstr ""
 "Ошибка SSL: %(error)s\n"
 "Соединиться с этим сервером?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6423,63 +6411,63 @@ msgstr ""
 "Отпечаток SHA1 сертификата:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Следующее сообщение получено в окне с фокусом"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Следующее сообщение получено в окне без фокуса"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Получено письмо на Gmail"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6489,7 +6477,7 @@ msgstr ""
 "Если иконка не пропадает долгое время,\n"
 "это означает, что сообщение потеряно."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6497,220 +6485,218 @@ msgstr ""
 "Текст под этой линией был сказан после того,\n"
 "как вы последний раз заглядывали в эту комнату"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
 msgstr "_Цитировать"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия для «%s»"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, 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:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
-msgstr "В URL Web-поиска отсутствует  «%s»"
+msgstr "В URL Web-поиска отсутствует «%s»"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Открыть как _ссылку"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Вчера"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i дней назад"
+msgid_plural "%i days ago"
+msgstr[0] "Вчера"
+msgstr[1] "Вчера"
+msgstr[2] "Вчера"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber ID уже в списке"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber ID, который вы ввели, уже существует. Выберите другой."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Имя контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Группа"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "В группе"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Установить настроение"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Сообщение о статусе %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Сообщение о статусе"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Изменить сообщение о статусе?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Это имя уже используется. Перезаписать это сообщение о статусе?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Сохранить установленное сообщение о статусе"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Введите имя для этого сообщения о статусе"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Адрес AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Номер GaduGadu"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Номер ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Адрес в MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Адрес Yahoo:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Заполните данные о контакте,\n"
 "который хотите добавить в ростер учетной записи %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Заполните данные о контакте, который вы хотите добавить"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Неверный ID пользователя"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "ID пользователя не должен содержать ресурс."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Вы не можете добавлять себя в свой ростер."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Контакт уже в ростере"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Этот контакт уже содержится в вашем ростере."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "ID пользователя:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Jabber-клиент на GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Версия GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Версия PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Разработчики:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Разработчики прошлых версий:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "И наконец, мы хотели бы поблагодарить всех мейнтейнеров пакетов."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Яков Безруков <nebulam51@gmail.com>\n"
@@ -6719,7 +6705,7 @@ msgstr ""
 "Денис Фомин <fominde@mail.ru>\n"
 "Григорий Сарницкий <sargrigory@ya.ru>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6730,98 +6716,100 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запрос на подписку для учетной записи %(account)s от %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Войти в комнату с учетной записи %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Выберите учетную запись, с которой вы хотите войти в комнату"
+msgstr "Выберите учетную запись, с которой вы хотите войти в комнату."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Неверное имя комнаты"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Это не комната"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не является именем комнаты."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Учётная запись не подключена к серверу"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Вы не можете синхронизировать учетную запись если она не подключена."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Синхронизировать"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Начать чат с учетной записью %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Начать чат"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6829,297 +6817,326 @@ msgstr ""
 "Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Соединение недоступно"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Удостоверьтесь, что вы подключены к «%s»."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Неверный JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не понимаю адреса «%s»."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Чтобы изменить пароль, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Необходимо ввести пароль."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковыми."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Контакт подключился"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Новое сообщение"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Контакт изменит статус"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Новое сообщение для учетной записи %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, 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:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Грустный"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Изменить"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Удалить"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?"
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> хочет <b>%s</b> несколько контактов в ваш список контактов."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
 msgstr "Добавить"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
 msgstr "Изменить"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 msgid "Groups"
 msgstr "Группы"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
+msgstr "%s предложил мне добавить вас в мой список контактов."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Добавить _контакт"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Удаляет контакт из ростера"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Список доступа <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Список доступа для %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
-"Номер: %(order)s,действие: %(action)s, тип: %(type)s, значение: %(value)s"
+"Номер: %(order)s, действие: %(action)s, тип: %(type)s, значение: %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Номер: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Изменить правило</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавить правило</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки доступа для %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Недопустимое имя списка"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для нового списка доступа."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Вы приглашены в конференцию"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact приглашает вас присоединиться к обсуждению."
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact приглашает вас в комнату %(room_jid)s."
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Вы принимаете приглашение?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Выберите звуковой файл"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "В формате Wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Выбрать картинку"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когда %s происходит:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавление специального уведомления для %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "когда я "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7130,19 +7147,19 @@ msgstr ""
 "\n"
 "Short Authentication String данного сеанса <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Вы уже удостоверили личность этого контакта."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Личность контакта удостоверена"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Удостоверить снова..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7152,19 +7169,19 @@ msgstr ""
 "сообщения или послать сообщения вам, вы должны удостоверить личность "
 "собеседника, нажав кнопку, расположенную ниже."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Личность контакта НЕ удостоверена"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Удостоверить..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Вы удостоверили личность удаленного контакта?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7179,23 +7196,23 @@ msgstr ""
 "\n"
 "Short Authentication String этого сеанса <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Вы переговорили с удаленным контактом и удостоверили SAS?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, 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:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
 "сообщения."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7204,7 +7221,7 @@ msgstr ""
 "Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь "
 "вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7212,6 +7229,25 @@ msgstr ""
 "Этому контакту присвоен ключ GPG, и вы доверяете этому ключу. Таким образом, "
 "сообщения будут зашифрованы."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Другие"
@@ -7221,24 +7257,24 @@ msgstr "Другие"
 msgid "Conference"
 msgstr "Комнаты"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подключиться к серверу"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Обзор сервисов с учётной записи %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Обзор сервисов (discovery)"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Сервис не обнаружен"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7246,287 +7282,267 @@ msgstr ""
 "По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
 "попробуйте еще раз."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Сервис недоступен для просмотра"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Неверное имя сервера"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Просмотр %(address)s с учетной записью %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Браузер"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "В_ыполнить команду..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "За_регистрироваться"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Сканирую %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Пользователи"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната «%s» уже есть в ваших закладках."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Подписка"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Узел"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Новое сообщение"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Отписаться"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr "Подтверждение SSL сертификата"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Библиотека используется для подтверждения действительности сертификатов "
 "сервера для того, чтобы удостовериться в защищенности соединения."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Требует python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Не требующее сервера общение между автоматически обнаруживаемыми клиентами в "
 "локальной сети."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Требует python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Требует pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 msgid "Command line"
 msgstr "Командная строка"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипт для управления Gajim'ом через командную строку."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Требует python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Эта возможность отсутствует в Windows."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
 msgstr "OpenPGP шифрование"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Шифрование сообщений при помощи gpg ключей."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Требует gpg и python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Автоопределение состояния соединения с сетью."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Требует gnome-network-manager и python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Управление сеансами"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "Сеанс Gajim сохраняется при выходе (logout) и восстанавливается при входе "
 "(login)."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Требует python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 msgid "Password encryption"
 msgstr "Шифрование паролей"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Пароли могут храниться безопасно, а не просто открытым текстом."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Требует gnome-keyring и python-gnome2-desktop."
+msgstr "Требует gnome-keyring и python-gnome2-desktop или kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Возможность соединяться с серверами, использующими SRV записи."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Требует dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Требует nslookup для использования SRV записей."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Проверка орфографии"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Проверка орфографии набираемых сообщений"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr "Требует библиотеку libgtkspell."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 msgid "Notification"
 msgstr "Уведомления"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Пассивные всплывающие окна для уведомления о новых событиях."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "Требует python-notify или python-dbus совместно с notification-daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Иконка в системном трее"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Иконка в системном лотке отображающая текущий статус."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Требует python-gnome2-extras или скомпилированного модуля trayicon из "
-"исходных кодов Gajim."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Требует PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Авто статус"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Возможность определения времени бездействия для того, чтобы установить "
 "автостатус."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr "Требует библиотеку libxss."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr "Требует python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Преобразовывать LaTeX выражения, заключенные в $$ $$"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7534,7 +7550,7 @@ msgstr ""
 "Требует texlive-latex-base и dvipng. Необходимо присвоить пункту 'use_latex' "
 "значение «Активно» в Расширенном редакторе настроек."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7543,23 +7559,23 @@ msgstr ""
 "присвоить пункту 'use_latex' значение «Активно» в Расширенном редакторе "
 "настроек."
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
 msgstr "End to end шифрование"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Шифрование сообщений чата."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Требует python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "Генератор RST"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7567,23 +7583,36 @@ msgstr ""
 "Генерировать XHTML вывод из кода RST (см. http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Требует python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr "Кликабельные ссылки"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Кликабельные ссылки в баннере."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Требует python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Требует python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Функции"
 
@@ -7599,139 +7628,138 @@ msgstr "Время"
 msgid "Progress"
 msgstr "Прогресс"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Вы"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Получатель:"
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сохранено в: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Передача отменена"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получатель: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Сообщение об ошибке: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
-msgstr "Передача остановлена"
+msgstr "Передача файла остановлена"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Выбрать файл для отправки..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Описание: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Нет доступа к файлу"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Файл занят другим процессом."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправить вам файл:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не могу заместить существующий файл «%s»"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 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:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папка «%s» не доступна для записи"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "У вас нет права создавать файлы в этой директории."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7739,32 +7767,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Неверный файл"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Имя: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Отправитель:"
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Пауза"
 
@@ -7775,7 +7803,7 @@ msgstr "Gajim для запуска требуется X-сервер. Выхо�
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "ошибка импортирования PyGTK: %s"
 
 #: ../src/gajim.py:180
 msgid "Gajim needs PyGTK 2.12 or above"
@@ -7828,11 +7856,11 @@ msgstr ""
 "его на сайте: %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim уже запущен"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7840,457 +7868,28 @@ msgstr ""
 "По-видимому, уже запущен другой экземпляр Gajim\n"
 "Запустить ещё один?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Требуется парольная фраза"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Введите пароль для ключа %(keyid)s (аккаунт %(account)s)."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr "Срок действия ключа GPG истёк"
-
-#: ../src/gajim.py:456
-#, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr ""
-"Срок действия вашего ключа GPG истёк, вы будете подключены к %s без "
-"использования OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Неверная парольная фраза"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Введите парольную фразу для GPG еще раз или нажмите «Отмена»."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Тот ник, что вы ввели в комнате %s уже используется или зарегистрирован "
-"другим пользователем.\n"
-"Укажите другой ник:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Вы принимаете этот запрос?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Вы принимаете запрос %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Соединение разорвалось"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Ошибка %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "ошибка при отправке %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-msgid "Subscription request"
-msgstr "Запрос подписки"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Авторизация принята"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Контакт «%s» отозвал подписку с вами"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Вы всегда будете видеть его или её как отключенными.\n"
-"Удалить его или её из контакт-листа?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "От подписки отказался"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Связь с «%s» не может быть установлена"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s теперь известен как %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s теперь %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s установил(а) тему: %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Любой участник может увидеть ваш настоящий JID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Теперь в комнате отображается недоступный участник"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "теперь в комнате не отображаются недоступные участники"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"Произошло изменение настроек комнаты, не относящееся к настройкам приватности"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Запись логов конференции включена"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Запись логов конференции выключена"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Конференция не анонимна"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Конференция частично анонимна"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Конференция полностью анонимна"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Чтобы войти в комнату %s, нужен пароль."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Gajim настроен на использование GPG агента, но GPG агент не запущен или он "
-"возвратил неверный пароль.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Вы сейчас соединены без ключа OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Ваша парольная фраза неверна"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Ваша парольная фраза неверна"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr "Ключ GPG не является доверенным"
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Ключ GPG используемый для шифрования не является доверенным. Вы "
-"действительно хотите зашифровать эти сообщения?"
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Не _переспрашивать"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring установлен, но некорректно запущен (возможно неверно "
-"установлена переменная среды)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Новое письмо на %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "У вас есть %d непрочитанное письмо"
-msgstr[1] "У вас есть %d непрочитанных письма"
-msgstr[2] "У вас есть %d непрочитанных писем"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"От: %(from_address)s\n"
-"Тема: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s хочет отправить вам файл."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Удаляет контакт из ростера"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Ошибка чтения файла:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Успешно получен файл %(filename)s от %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Передача файла %(filename)s от %(name)s приостановлена."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Передача файла %(filename)s к %(name)s приостановлена."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Не удалось расшифровать сообщение от %s\n"
-"Возможно, оно было испорчено."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Сообщение не удалось расшифровать"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Такое имя уже есть"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Введите новое имя пользователя для локальной учетной записи"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s сек.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Ошибка."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Такое имя уже есть"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
-"другой ресурс"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Ошибка при проверке SSL сертификата"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Произошла ошибка при проверке сертификата SSL вашего jabber сервера: %(error)"
-"s\n"
-"Вы всё ещё хотите подключиться к этому серверу?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Игнорировать эту ошибку для данного сертификата."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Ошибка SSL сертификата"
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-"По видимому, сертификат SSL учетной записи %(account)s изменился или ваше "
-"соединение было взломано.\n"
-"Старый отпечаток: %(old)s\n"
-"Новый отпечаток: %(new)s\n"
-"Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Небезопасное соединение"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Да, я действительно хочу соединиться небезопасно"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
-"(Установите PyOpenSSL, чтобы этого не происходило.)"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "PEP узел не был удален"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP узел %(node)s не был удален: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Смайлики выключены"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr "Тема смайликов не найдена, они будут отключены."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
-"emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Не могу сохранить ваши установки и настройки"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Показывает помощь для конкретной команды"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "показать помощь по команде"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Скрывает или показывает окно ростера"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Показывать окно со следующим непрочитанным сообщением"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8298,50 +7897,50 @@ msgstr ""
 "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
 "строке"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "Учетные записи"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "показывать контакты только для данной учетной записи"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Показывает список зарегистрированных учетных записей"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Изменяет статус учетной записи или записей"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "статус"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "сообщение"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "сообщение о статусе"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8350,48 +7949,44 @@ msgstr ""
 "изменить статус всех учетных записей, у которых установлена опция "
 "«синхронизировать с глобальным статусом»"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Изменяет статус учетной записи или записей"
+msgstr "Изменяет приоритет учетной записи или записей"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Приори_тет:"
+msgstr "Приоритет"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Я хочу _зарегистрировать новую учетную запись"
+msgstr "приоритет, который вы хотите назначить для учетной записи"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"изменяет статус учетной записи «учетная запись». Если не указано, пытается "
-"изменить статус всех учетных записей, у которых установлена опция "
-"«синхронизировать с глобальным статусом»"
+"изменяет приоритет учетной записи. Если не указано, пытается изменить статус "
+"всех учетных записей, у которых установлена опция «синхронизировать с "
+"глобальным статусом»"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Показывает окно беседы, чтобы вы могли отправлять сообщения контакту"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакта, с которым вы хотели бы побеседовать"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "содержимое сообщения. Учетная запись должна быть указана или \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8401,31 +7996,31 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP ключ"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "если указано, сообщение будет зашифровано с использованием открытого ключа"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 "если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8435,210 +8030,211 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тема сообщения"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Отправляет новые сообщения в комнату, к которой вы присоединились."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о учетной записи"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Имя учетной записи"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Путь до файла"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr ""
 "если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "имя параметра, который нужно удалить"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Добавляет контакт в ростер"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Добавляет новый контакт для данной учетной записи"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не "
 "указана учетная запись)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Возвращает количество непрочитанных сообщений"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Открыть диалог «Начать беседу»"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Начать беседу с этой учетной записи"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Отправляет произвольный XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "Отправляемый XML"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
-msgstr "Учётная запись, из которой будет отправлен XML."
+msgstr ""
+"Учётная запись, которой будет отправлен XML. Если не указано, xml будет "
+"послан всем контактам."
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработать ссылку формата «xmpp:/»"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI для обработки"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Учетная запись, в которой вы хотите его использовать"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "содержимое сообщения"
+msgstr "Cодержимое сообщения"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Присоединиться к комнате MUC"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "комната"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "JID комнаты"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "Ник"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Используемый ник"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "Пароль:"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Пароль для входа в комнату"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Выберите учетную запись, с которой вы хотите войти в комнату"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Проверить, запущен ли Gajim"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Скрывает или показывает окно ipython"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент «JID контакта»"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8647,15 +8243,15 @@ msgstr ""
 "'%s' не в вашем ростере.\n"
 "Укажите учетную запись для отправки сообщения."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "У вас нет ни одной активной учетной записи"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "По-видимому, Gajim не запущен. Вы не можете использовать gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8664,16 +8260,16 @@ msgstr ""
 "Использование: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8682,7 +8278,7 @@ msgstr ""
 "Использование: %s команда [аргумента]\n"
 "Команда одна из:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8691,7 +8287,7 @@ msgstr ""
 "Много аргументов. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8700,7 +8296,7 @@ msgstr ""
 "Аргумент «%(arg)s» не задан. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Неверный хост"
 
@@ -8729,150 +8325,174 @@ msgstr "Вы не можете удалить вашу текущую тему"
 msgid "Please first choose another for your current theme."
 msgstr "Выберите сначала другую тему."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы больше не находитесь в комнате «%(room)s» или «%(nick)s» вышел."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Беседа с "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Возобновлённая беседа"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Любой участник может увидеть ваш настоящий JID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Новая комната была создана"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер присвоил или изменил ваш ник в комнате"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил(а) %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s теперь известен как %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "ранг изменен"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "настройки комнаты были изменены на 'только для участников'"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "выключение системы"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(actor)s присвоил %(nick)s ранг %(affiliation)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(actor)s присвоил %(nick)s обязанности %(role)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Обязанности %(nick)s были изменены на %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s теперь %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты «%s»?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Не _переспрашивать"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Смена темы"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Введите новую тему:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Смена ника"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Введите новый ник, который вы хотите использовать:"
 
 # смотря где вылазит меседж - нужно присмотреться
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Удаление %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8880,22 +8500,22 @@ msgstr ""
 "Вы собираетесь полностью уничтожить эту комнату.\n"
 "Можете указать причину:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Можете указать альтернативную комнату:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Выгоняем %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -8921,60 +8541,471 @@ msgid "Details"
 msgstr "Детали"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Ошибка чтения файла:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Ошибка обработки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Не могу писать в %s. Управление сеансами будет недоступно"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не является основным jabber-клиентом"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Вы хотите сделать Gajim основным jabber-клиентом?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Расширение не поддерживается"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Изображение нельзя сохранить в формате %(type)s. Сохранить как %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Тот ник, что вы ввели в комнате %s уже используется или зарегистрирован "
+"другим пользователем.\n"
+"Укажите другой ник:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Всегда использовать этот ник в случае конфликта"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Вы принимаете этот запрос?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Вы принимаете запрос %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Соединение разорвалось"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Ошибка %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "ошибка при отправке %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Запрос подписки"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Авторизация принята"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Контакт «%s» отозвал подписку с вами"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Вы всегда будете видеть его или её как отключенными.\n"
+"Удалить его или её из контакт-листа?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "От подписки отказался"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Связь с «%s» не может быть установлена"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s установил(а) тему: %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Теперь в комнате отображается недоступный участник"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "теперь в комнате не отображаются недоступные участники"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Произошло изменение настроек комнаты, не относящееся к настройкам приватности"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Запись логов конференции включена"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Запись логов конференции выключена"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Конференция не анонимна"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Конференция частично анонимна"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Конференция полностью анонимна"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Чтобы войти в комнату %s, нужен пароль."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Gajim настроен на использование GPG агента, но GPG агент не запущен или он "
+"возвратил неверный пароль.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Вы сейчас соединены без ключа OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Ваша парольная фраза неверна"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Парольная фраза OpenGPG неверна"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "Ключ GPG не является доверенным"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Ключ GPG используемый для шифрования не является доверенным. Вы "
+"действительно хотите зашифровать эти сообщения?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring установлен, но некорректно запущен (возможно неверно "
+"установлена переменная среды)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Новое письмо на %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "У вас есть %d непрочитанное письмо"
+msgstr[1] "У вас есть %d непрочитанных письма"
+msgstr[2] "У вас есть %d непрочитанных писем"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"От: %(from_address)s\n"
+"Тема: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s хочет отправить вам файл."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Удаленный контакт остановил передачу"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Ошибка открытия файла"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Успешно получен файл %(filename)s от %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Передача файла %(filename)s от %(name)s приостановлена."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Передача файла %(filename)s к %(name)s приостановлена."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Не удалось расшифровать сообщение от %s\n"
+"Возможно, оно было испорчено."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Сообщение не удалось расшифровать"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Такое имя уже есть"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Введите новое имя пользователя для локальной учетной записи"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s сек.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Ошибка."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Такое имя уже есть"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
+"другой ресурс"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s хочет отправить вам файл."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Запрос передачи"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Ошибка при проверке SSL сертификата"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Произошла ошибка при проверке сертификата SSL вашего jabber сервера: %(error)"
+"s\n"
+"Вы всё ещё хотите подключиться к этому серверу?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Игнорировать эту ошибку для данного сертификата."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Ошибка SSL сертификата"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"По видимому, сертификат SSL учетной записи %(account)s изменился или ваше "
+"соединение было взломано.\n"
+"Старый отпечаток: %(old)s\n"
+"Новый отпечаток: %(new)s\n"
+"Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Небезопасное соединение"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Да, я действительно хочу соединиться небезопасно"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
+"(Установите PyOpenSSL, чтобы этого не происходило.)"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP узел не был удален"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP узел %(node)s не был удален: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Смайлики выключены"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr "Тема смайликов не найдена, они будут отключены."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
+"emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+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/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Не могу сохранить ваши установки и настройки"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Требуется парольная фраза"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Введите пароль для ключа %(keyid)s (аккаунт %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "Срок действия ключа GPG истёк"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr ""
+"Срок действия вашего ключа GPG истёк, вы будете подключены к %s без "
+"использования OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Неверная парольная фраза"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Введите парольную фразу для GPG еще раз или нажмите «Отмена»."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "В _новую комнату"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
 
@@ -8989,7 +9020,7 @@ msgstr "Контакты"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Дата"
 
@@ -9000,7 +9031,7 @@ msgstr "Ник"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Сообщение"
 
@@ -9025,237 +9056,241 @@ msgstr ""
 "\n"
 "Если вы нажали ДА, пожалуйста подождите..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Экспортирую историю..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s в %(time)s сказал: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Вы точно хотите удалить логи выделенного контакта?"
 msgstr[1] "Вы точно хотите удалить логи выделенных контактов?"
 msgstr[2] "Вы точно хотите удалить логи выделенных контактов?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Это необратимая операция"
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы точно хотите удалить выделенное сообщение?"
 msgstr[1] "Вы точно хотите удалить выделенные сообщения?"
 msgstr[2] "Вы точно хотите удалить выделенные сообщения?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Ошибка записи на диск"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s теперь %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Сообщение об ошибке: %s"
+msgstr "Ошибка: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Ошибка."
+msgstr "Ошибка"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус установлен в: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Не могу загрузить изображение"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Изображение слишком большое"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
 msgstr "Вы собираетесь закрыть несколько вкладок"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
 msgstr "Действительно закрыть их всех?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Чаты"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Комнаты"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Личные беседы"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Сообщения"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "— сообщения будут записаны в лог"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "— сообщения не будут записаны в лог"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s меняет статус"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s подключается"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s отключается"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новое личное сообщение из комнаты %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Получаю данные..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Пустой файл"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Файл не существует"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Информация получена"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Необходимо присоединиться к серверу для обновления личной информации"
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Отправляю данные..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Информация НЕ опубликована"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Публикация vCard не удалась"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "При публикации вашей личной информации произошла ошибка, попробуйте позже."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь «%s» будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG использовать невозможно"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Вы будете подключены к %s без использования OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9263,27 +9298,27 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "не синхронизировано"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr "Закрыть Gajim?"
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы точно хотите закрыть Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr "Всегда закрывать Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9291,16 +9326,16 @@ msgstr ""
 "Сообщения будут доступны для чтения позже, если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт «%s» будет удален"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9308,11 +9343,11 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9321,69 +9356,70 @@ msgstr ""
 "У вас больше не будет возможности приема и отправки сообщений через эти "
 "транспорты:%s."
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
-msgstr "Вы точно хотите создать метаконтакт?"
+msgstr "Вы точно хотите заблокировать контакт?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Этот контакт будет видеть вас как отключенного, а вы не будете получать от "
+"него сообщения."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Назначить ключ OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» будет удален из вашего ростера"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Вы собираетесь удалить «%(name)s» (%(jid)s) из вашего списка контактов.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9392,11 +9428,11 @@ msgstr ""
 "не сможет видеть ваш статус."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9404,16 +9440,16 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9423,33 +9459,35 @@ msgstr ""
 "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
 "оффлайне."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
-msgstr "Вы точно хотите создать метаконтакт?"
+msgstr "Вы точно хотите послать другой статус?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Этот контакт будет временно видеть ваш статус как %(status)s, но лишь пока "
+"вы не измените свой глобальный статус. Тогда этому контакту станет виден "
+"глобальный статус."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9457,12 +9495,12 @@ msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
 "следующем подключении."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы точно хотите создать метаконтакт?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9472,11 +9510,11 @@ msgstr ""
 "Обычно используется, когда один и тот же человек имеет несколько учетных "
 "записей в Jabber или на транспортах."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9484,12 +9522,12 @@ msgstr[0] "Хотите отправить файл %s:"
 msgstr[1] "Хотите отправить файлы %s:"
 msgstr[2] "Хотите отправить файлы %s:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, python-format
 msgid "Send %s to %s"
 msgstr "Отправить %s контакту %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Обьединить %s и %s в метаконтакт"
@@ -9499,157 +9537,156 @@ msgstr "Обьединить %s и %s в метаконтакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "для учетной записи %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "учетной записи %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "Управление _закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Настроить Сервисы..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Редактировать _группы"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Отправить одиночное сообщение"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Управление транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "П_ереименовать"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Выйти"
+msgstr "_Переподсоеденится"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Выйти"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Войти в новую комнату"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Изменить сообщение о статусе..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Ожидание результатов"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Ошибка в принятой форме данных"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Нет результата"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Ошибка записи на диск"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Подтвердить данные настройки сеанса"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9664,7 +9701,7 @@ msgstr ""
 "\n"
 "\tПриемлемы ли эти настройки?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9679,116 +9716,116 @@ msgstr ""
 "\n"
 "Продолжить этот сеанс?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Изменить сообщение о статусе..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s этой комнаты"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr "[заблокировано]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr "[свернуто]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Статус: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Последний статус: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " с %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Соединение"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Контакт отключился"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Подписка: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Слушаю:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Скачать"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Загрузить"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Передано: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Не начато"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Остановлено"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "Приостановлено"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Ожидание"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Передается"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Этот сервис еще не сообщил информацию о себе"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9796,28 +9833,28 @@ msgstr ""
 "Этот сервис не может предоставить подробную информацию о себе. \n"
 "Скорее всего, он устарел или сломан"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
 msgstr "?Time:Неизвестно"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "с %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9825,7 +9862,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9833,34 +9870,85 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ни вы, ни ваш контакт не желаете знать о присутствии друг друга"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Нет ожидающего запроса на подписку."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#~ msgid "Add Special _Notification"
-#~ msgstr "Добавить специальное _уведомление"
+#~ msgid "_Incoming message:"
+#~ msgstr "_Входящее сообщение:"
 
-#~ msgid "Assign Open_PGP Key"
-#~ msgstr "Назначить ключ  Open_PGP"
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Исходящее сообщение:"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Хост %s, который настроен как ft_add_hosts_to_send, не действителен, "
+#~ "поэтому игнорируется."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Не задана парольная фраза OpenPGP"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Требуется переподключение для продолжения приема и отправки сообщений."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Вы не подключены или невидимы для других. Ваше сообщение нельзя отправить."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Это сообщение зашифровано]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i день назад"
+
+#~ msgid "Trayicon"
+#~ msgstr "Иконка в системном трее"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Иконка в системном лотке отображающая текущий статус."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Требует python-gnome2-extras или скомпилированного модуля trayicon из "
+#~ "исходных кодов Gajim."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Требует PyGTK >= 2.10."
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr ""
+#~ "Приём и отправка локальных (link-local) сообщений и сообщений в сетях "
+#~ "zeroconf"
 
 #~ msgid "Command not supported for zeroconf account."
 #~ msgstr "Команда не поддерживается учетной записью zeroconf."
@@ -9890,11 +9978,6 @@ msgstr " ресурс с приоритетом "
 #~ msgid "No help info for /%s"
 #~ msgstr "Нет подсказки для /%s"
 
-#~ msgid "Enable link-local/zeroconf messaging"
-#~ msgstr ""
-#~ "Приём и отправка локальных (link-local) сообщений и сообщений в сетях "
-#~ "zeroconf"
-
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Ник не обнаружен: %s"
 
@@ -9904,11 +9987,23 @@ msgstr " ресурс с приоритетом "
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "Пригласил(а) %(contact_jid)s в %(room_jid)s."
 
-#, fuzzy
+#~ msgid ""
+#~ "There is an ambiguity: %d nicks match.\n"
+#~ " Please use graphical interface "
+#~ msgstr ""
+#~ "Неоднозначность: %d ника совпадают.\n"
+#~ " Используйте графический интерфейс"
+
 #~ msgid "Nickname not found"
-#~ msgstr "Ник не обнаружен: %s"
+#~ msgstr "Ник не обнаружен"
+
+#~ msgid ""
+#~ "There is an ambiguity: %d nicks match.\n"
+#~ " Please use graphical interface"
+#~ msgstr ""
+#~ "Неоднозначность: %d ника совпадают.\n"
+#~ " Используйте графический интерфейс"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -9916,8 +10011,7 @@ msgstr " ресурс с приоритетом "
 #~ msgstr ""
 #~ "Использование: /%s <ник|JID> [причина], запрещает JID заходить в комнату. "
 #~ "Ник посетителя можно подставить, если он не содержит «@». Если JID в "
-#~ "данный момент находится в комнате, то он/она/оно также будет выгнан. НЕ "
-#~ "поддерживает пробелы в никах."
+#~ "данный момент находится в комнате, то он/она/оно также будет выгнан."
 
 #~ msgid ""
 #~ "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -9946,13 +10040,12 @@ msgstr " ресурс с приоритетом "
 #~ "Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к "
 #~ "комната@сервер, с возможным указанием ника."
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
 #~ "nickname from the group chat and optionally displays a reason."
 #~ msgstr ""
 #~ "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником "
-#~ "из комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
+#~ "из комнаты с возможным указанием причины."
 
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -9988,6 +10081,12 @@ msgstr " ресурс с приоритетом "
 #~ "messages."
 #~ msgstr "Использование: /%s <ник>, разрешить <ник> отправлять вам сообщения."
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Добавить специальное _уведомление"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Назначить ключ  Open_PGP"
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "Порт B_OSH:"
 
diff --git a/po/sk.po b/po/sk.po
index 81bcb2d1c..2c3c6c044 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-20 00:04+0200\n"
 "Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -279,9 +279,9 @@ msgstr "Upraviť osobné informácie..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -290,9 +290,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Všeobecné"
 
@@ -351,21 +351,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informácie o vás sú uložené na serveri"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Žiadny kľúč nie je vybraný"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Žiadny"
 
@@ -524,8 +524,8 @@ msgstr ""
 "Zoberte v úvahu aj prípadné nastavenie firewallu."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -539,7 +539,7 @@ msgid "Mer_ge accounts"
 msgstr "Z_lúčiť účty"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Preme_novať"
 
@@ -944,7 +944,7 @@ msgstr "Posledná zmena:"
 msgid "New entry received"
 msgstr "Prijatý nový záznam"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Dostali ste novú položku:"
 
@@ -988,11 +988,11 @@ msgstr "Vložte nové heslo:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Zadajte vašu novú správu o stave</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Aktivita:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Nálada:"
 
@@ -1080,8 +1080,8 @@ msgstr "Upraviť _skupiny..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "Poz_vať do"
 
@@ -1094,8 +1094,8 @@ msgid "Remo_ve"
 msgstr "O_dstrániť"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Poslať vlas_tný stav"
 
@@ -1128,8 +1128,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Povoliť jemu/jej vidieť môj stav"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Blokovať"
 
@@ -1140,7 +1140,7 @@ msgstr "_Odmietnuť jemu/jej zobrazenie stavu"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_História"
 
@@ -1161,8 +1161,8 @@ msgid "_Subscription"
 msgstr "_Požiadavky"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Odblokovať"
 
@@ -1250,7 +1250,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie upozornenie"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Pokračovať"
 
@@ -1258,7 +1258,7 @@ msgstr "_Pokračovať"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozorniť ma, keď sa dokončí prenos"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Otvoriť priečinok s obsahom"
 
@@ -1286,7 +1286,7 @@ msgstr ""
 "Riadok s kontaktom\n"
 "Titulok diskusie"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Tučné"
 
@@ -1306,11 +1306,11 @@ msgstr "Úprava tém programu Gajim"
 msgid "Gone"
 msgstr "Minulé"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktívny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Kurzíva"
 
@@ -1358,7 +1358,7 @@ msgstr "Zmeniť _predmet..."
 msgid "Configure _Room..."
 msgstr "Nastaviť _miestnosť..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "Zálož_ky"
 
@@ -1447,8 +1447,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Vitajte v Gajim správca histórie</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -1478,7 +1479,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Hľadať v databáze"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "História konverzácie"
 
@@ -1506,7 +1507,7 @@ msgstr "Zaznamenávať históriu k_onverzácie"
 msgid "Bookmark this room"
 msgstr "Zazáložkovať túto miestosť (Ctrl+B)"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
@@ -1533,8 +1534,8 @@ msgstr "Posledné:"
 msgid "Room:"
 msgstr "Miestnosť:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Pripojiť"
 
@@ -1562,7 +1563,7 @@ msgstr "Minimalizovať pri automatickom pripojení"
 msgid "Print status:"
 msgstr "Vypísať stav:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1679,17 +1680,26 @@ msgid "Show a list of formattings"
 msgstr "Zobraziť zoznam emotikon (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Zobraziť ponuku pokročilých funkcií (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Zobraziť profil kontaktu (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Poslať"
 
@@ -1821,6 +1831,16 @@ msgid "Configure color and font of the interface"
 msgstr "Nastavovať farbu a písmo rozhrania"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Správa rozhovoru:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Meno kontaktu"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1834,31 +1854,31 @@ msgstr ""
 "Oddelený zoznam od spojených rozhovorov podľa účtu\n"
 "Oddelený zoznam od spojených rozhovorov podľa typu"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Zobraziť _aktivitu kontaktov v zozname kontaktov"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Zobraziť ďalši_e podrobnosti o e-maile"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Zobraziť _hudbu kontaktov v zozname kontaktov"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zobraziť a_vatary v zozname kontaktov"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Zobraziť _náladu kontaktov v zozname kontaktov"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1868,7 +1888,7 @@ msgstr ""
 "inou osobou. Tu môžete vybrať stavy, ktoré majú byť zobrazované v diskusnom "
 "okne."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1878,7 +1898,7 @@ msgstr ""
 "vašim kontaktom. Tu môžete vybrať stavy, o ktorých majú byť odosielané "
 "informácie druhej strane."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1886,11 +1906,11 @@ msgstr ""
 "Gajim vás bude upozorňovať vyskakovacími oknami v pravej spodnej časti "
 "obrazovky na kontakty, ktoré sa práve odpojili"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Skryje všetky tlačidlá v oknách rozhovorov"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1898,20 +1918,20 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Ak je zaškrtnuté, Gajim pridá informácie o odosielateľovi do nových e-mailov"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ak je zaškrtnuté, Gajim zmení stav na Preč, keď nebude používaný počítač."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1919,7 +1939,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim zmení stav na Neprítomný, keď nebude dlhšie "
 "používaný počítač."
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1927,7 +1947,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname kontaktov a v "
 "oknách s diskusnými skupinami."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1935,28 +1955,28 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave kontaktov pod menom v "
 "zozname kontaktov a v oknách s diskusnými skupinami"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať aktivitu kontaktov v okne sozoznamom "
 "kontaktov."
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať náladu kontaktov v okne so zoznamom "
 "kontaktovi."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať hudbu kontaktov v okne so zoznamom "
 "kontaktov"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1967,7 +1987,7 @@ msgstr ""
 "pravým na vstupné pole, predvolený jazyk bude použitý pre tento kontakt "
 "alebo diskusnú skupinu."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1977,14 +1997,14 @@ msgstr ""
 "neautorizovaných kontaktov. Použite opatrne, pretože to blokuje všetky "
 "správy od akýchkoľvek kontaktov, ktoré nie sú v zozname"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1992,7 +2012,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim zobrazí upozornenie, keď bude prijatý nový e-mail "
 "cez GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2002,7 +2022,7 @@ msgstr ""
 "kontakt z MSN bude mať ekvivalentné ikonky pre stavy prítomný, preč, "
 "zaneprázdnený, atď...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2010,7 +2030,7 @@ msgstr ""
 "Ak je povolené, Gajim sa nebude pýtať na správu o stave. Namiesto nej bude "
 "použitá predvolená špecifikovaná správa."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2018,50 +2038,50 @@ msgstr ""
 "Ak nie je zakázané, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
 "grafickým obrázkom"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Zaznamenať reláciu šifrova_ného rozhovoru"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Zmeniť okno správ na _kompaktné"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "_Spravovať..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Upozornenia"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Upozorniť keď príde na _Gmail e-mail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Osobné udalosti"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Prehrať _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2071,24 +2091,24 @@ msgstr ""
 "Upozorniť ma o tom\n"
 "Zobraziť len v zozname kontaktov"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Predvoľby"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Zobraziť udalosť v oblasti systémových upozornení"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Prihlás_il sa"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "_Odhlásil sa"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2096,27 +2116,27 @@ msgstr ""
 "Niektoré správy môžu obsahovať rozširujúce informácie (formátovanie, farby, "
 "atď.). Ak je zaškrtnuté, Gajim bude zobrazovať len jednoduchý text."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Usporiadať kontakty podľa stavu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Zostava stavových _ikôn:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Štýl"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 #, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
@@ -2127,7 +2147,7 @@ msgstr ""
 "Automatická správa pre stav preč. Ak je prázdna, Gajim nebude meniť súčasnú "
 "stavovú správu o stave"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 #, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
@@ -2138,103 +2158,105 @@ msgstr ""
 "Automatická správa pre stav neprítomný. Ak je prázdna, Gajim nebude meniť "
 "súčasnú správu o stave"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Použiť ikony _transportov"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Použiť systémové _nastavenia"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Keď nastane nová udalosť:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Chybová správa: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Prezývka:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "_Preč po:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Prehliadač:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "Zo_braziť upozornenia o stave rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Emotikony:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Správca súborov:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Zvýrazniť zle napísané slová"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktoré nie sú v zozname"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorovať rozšírený obsah prichádzajúcich správ"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Prichádzajúca správa:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_E-mailový klient:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "_Neprítomný po:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Odchádzajúca správa:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "Náv_rat k pôvodnému nastaveniu farieb"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "Odo_slať upozornenia o stave rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Správa o stave:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "Zvýrazňovanie _URL:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Správanie okna:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "v _diskusných skupiných"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "v _zozname kontaktov"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minút"
 
@@ -2287,7 +2309,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Poradie:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Súkromný zoznam"
 
@@ -2431,7 +2453,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Titul pred:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Úloha:</b>"
 
@@ -2491,8 +2513,8 @@ msgstr "Odstrániť účet z Gajim aj zo _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "O_dstrániť"
 
@@ -2511,13 +2533,13 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
+msgid "gtk-cancel"
 msgstr "gtk-close"
 
 #: ../data/glade/roster_window.glade.h:1
@@ -2576,7 +2598,7 @@ msgstr "_Akcie"
 msgid "_Contents"
 msgstr "Ob_sah"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Upraviť"
 
@@ -2617,11 +2639,11 @@ msgid "_Add contact"
 msgstr "_Pridať kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Informácie"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Hľadať"
 
@@ -2641,10 +2663,6 @@ msgstr "Registrovaný na"
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2850,394 +2868,380 @@ msgstr "Zdroj:"
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Zrušiť potvrdenie"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Služba zmenila identifikátor relácie."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktivovaná"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Deaktivovaná"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Logický"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Celočíselný"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Farba"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Názov vlastnosti"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Žiadny)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Skryté"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Dostali ste novú položku:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Dostali ste novú položku:"
+msgstr[1] "Dostali ste novú položku:"
+msgstr[2] "Dostali ste novú položku:"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Angličtina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Bieloruština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulharčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretónčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Nemčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Gréčtina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Britština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Španielčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Baskičtina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Francúzština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Chorvátčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Taliančina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Nórčina (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Nórčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Poľština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugalčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brazílska portugalčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Srbština"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Švédčina"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Čínština (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Jazyk používaný pri kontrole pravopisu"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Vašu správu nie je možné odoslať, pokiaľ nebudete pripojený."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "Neurčitý"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "Chorý"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktné informácie"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Skutočne poslať súbor?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ak pošlete súbor %s, on/ona budú poznať vaše skutočné Jabber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "Povolené GPG šifrovanie"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Zoznam aktívnych, dokončených a zastavených prenosov súborov"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Neznámy umelec"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Neznámy titulok"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Neznámy zdroj"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
-"z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskusnej skupiny %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr "=="
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "Zakázané GPG šifrovanie"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Relácia BUDE zaznamenaná"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Relácia NEBUDE zaznamenaná"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "NIE je"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "NEbude"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "a overený"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
 msgstr "a NEoverený"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Táto relácia je šifrovaná"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr " a BUDE zaznamenaná"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr " a NEBUDE zaznamenaná"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E šifrovanie zakázané"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Nasledujúca správa NEbola šifrovaná"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Nasledujúca správa bola šifrovaná"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Práve ste prijali novú správu od \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Ak zatvoríte túto kartu a máte deaktivovanú históriu, správa bude stratená."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Chyba databázy"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3246,7 +3250,7 @@ msgstr ""
 "Súbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť alebo ho "
 "odstrániť (všetko v histórii bude stratené)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je teraz %(status)s"
@@ -3255,23 +3259,23 @@ msgstr "%(name)s je teraz %(status)s"
 msgid "creating logs database"
 msgstr "vytváranie záznamov databáz"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je súbor ale mal byť priečinok"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim bude ukončený"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je priečinok ale mal byť súbor"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "vytváram priečinok %s"
@@ -3334,10 +3338,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Zvolte diskusné skupiny, ktoré chcete opustiť"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Diskuné skupiny"
 
@@ -3445,9 +3449,9 @@ msgstr ""
 "Zoznam (oddelený medzerami) a riadkov (účet a skupina), ktoré sú zabalené."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "predvolená"
 
@@ -4066,7 +4070,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4074,25 +4078,25 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim použije vašu IP adresu a proxy definovanú v "
 "premennej file_transfer_proxies na prenos súborov."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Má tento kontakt k dispozícii OpenPGP?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4100,199 +4104,198 @@ msgstr ""
 "Mal by sa Gajim spúšťať automaticky so šifrovanou reláciou pre tento kontakt "
 "keď je to možné?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk v ktorom má byť prevádzaná kontrola pravopisu"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "všetky alebo medzerou oddelené stavy"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'áno', 'nie', alebo 'oboje'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'áno', 'nie' alebo ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracujem"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefonujem"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Telefonujem."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Vonku"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Som vonku a užívam si život."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Prítomný."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Mám čas na rozhovor."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Nie som prítomný."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Nerušiť."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Ahoj!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "námornícka"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nie je možné nahrať idle modul"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Nesprávny hostiteľ"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Neplatná miestna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Redistračné informácie pre službu %s nedorazili včas"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Registrovať na %s"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "Spojenie zlyhalo"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditeľnosť."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Nesprávné Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, fuzzy, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4301,7 +4304,7 @@ msgstr ""
 "Súbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť alebo ho "
 "odstrániť (všetko v histórii bude stratené)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Prezývka nie je povolená: %s"
@@ -4309,76 +4312,76 @@ msgstr "Prezývka nie je povolená: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskusná skupina %s neexistuje."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Vytváranie diskusných skupín je obmedzené."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vaša zaregistrovaná prezývka musí byť použitá v diskusnej skupine %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nie ste v zozname členov v skupinovej diskusii %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Miestnosť bola zničená"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Chcem si vás pridať do môjho zoznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sme prihlásení k %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sme odhlásení od %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4516,79 +4519,107 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Nie je možné poslať prázdne súbory"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Táto správa je *šifrovaná* (Pozrite :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Predmet: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Znovu pripojiť manuálne."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s odpovedal zle na požiadavku o registráciu: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytol rozdielny registračný formulár"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznáma chyba SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s odpovedal nesprávne pri odoslaní registračnej požiadavky: "
 "%(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Uložené do: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Pripojenie k proxy zlyhalo"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie je možné pripojiť sa k účtu %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Spojenie s účtom \"%s\" bolo stratené. Zopakuje sa pripájanie."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4597,7 +4628,7 @@ msgstr ""
 "\n"
 "Chyba SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4606,24 +4637,24 @@ msgstr ""
 "\n"
 "Neznáma chyba SSL: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Overenie zlyhalo s \"%s\""
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Chyba počas odstraňovania súkromného zoznamu"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4632,76 +4663,45 @@ msgstr ""
 "Súkromný zoznam %s nebol odstránený. Možno je používaný jedným z vašich "
 "pripojených zdrojov. Deaktivujte ho a skúste to znovu."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Nie je možné poslať prázdne súbory"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Táto správa je *šifrovaná* (Pozrite :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Predmet: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Pozvať _kontakty"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Nie je možné získať, pretože aktuálny stav je: Neviditeľný"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Spojenie zlyhalo"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Pozorovatelia"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Nie je v zozname"
 
@@ -4948,7 +4948,7 @@ msgstr "Mám čas na debatu"
 msgid "_Available"
 msgstr "_Prítomný"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Prítomný"
 
@@ -5066,48 +5066,48 @@ msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5115,22 +5115,22 @@ msgstr[0] "%d správ čaká"
 msgstr[1] "%d správa čaká"
 msgstr[2] "%d správy čakajú"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " z miestnosti %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " od používateľa %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5138,7 +5138,7 @@ msgstr[0] "%d udalostí čaká"
 msgstr[1] "%d udalosť čaká"
 msgstr[2] "%d udalosti čakajú"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5154,16 +5154,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "azúrová"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -5172,640 +5172,661 @@ msgstr ""
 msgid "XMPP account %s@%s"
 msgstr "účtu %s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Vystrašený"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Prekvapený"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Zamilovaný"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Nahnevaný"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Mrzutý"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Znepokojený"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Vyburcovaný"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Zahanbený"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Znudený"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Statočný"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Pokojný"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Opatrný"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Podchladený"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Sebaistý"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Zmätený"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Hĺbavý"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Spokojný"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Rozhádzaný"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Bláznivý"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Tvorivý"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Zvedavý"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Deprimovaný"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Skľúčený"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Sklamaný"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Znechutený"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Zhrozený"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Zmätený"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Rozpačitý"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Zavistlivý"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Vzrušený"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Koketný"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustrovaný"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Príjemný"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Trúchliaci"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Podráždený"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Previnilý"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Šťastný"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Nádejný"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Prehriaty"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Ponížený"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Porazený"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Hladný"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Zranený"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Ohromený"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Rešpektovaný"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Zaľúbený"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Rozhorčený"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Zainteresovaný"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Opitý"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Nepremožiteľný"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Žiarlivý"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Osamelý"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Stratený"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Šťastný"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Protivný"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Náladový"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervózny"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutrálny"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Urazený"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Pobúrený"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Hravý"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Hrdý"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Odpočinutý"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Odľahčený"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Kajajúci"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Neposedný"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Smutný"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Uštipačný"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Spokojný"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Vážny"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Šokovaný"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Hanblivý"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Chorý"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Ospanlivý"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontánny"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Vystresovaný"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Silný"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Prekvapený"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Vďačný"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Smädný"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Unavený"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Neurčitý"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Slabý"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Ustarostený"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Domáce práce"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Kupujem potraviny"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Čistím"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Varím"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Robím údržbu"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Umývam riad"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Periem"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Záhradničím"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Na obchôdzke"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Venčím psa"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Pijem"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Pijem pivo"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Pijem kávu"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Pijem čaj"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Desiatujem"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Raňajkujem"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Večeriam"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Obedujem"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Bicyklujem"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "Čistím"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Som na túre"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Klusám"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Športujem"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Bežím"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Lyžujem"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Plávam"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Posilňujem"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Starám sa o seba"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "V kúpeloch"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Čistím si zuby"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "V kaderníctve"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Holím sa"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Kúpem sa"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Sprchujem sa"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Na schôdzke"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Koniec dňa"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Som vonku"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "Som na túre"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "Na dovolenke"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "Žúrujem"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Plánovaná dovolenka"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "Pijem"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Oddychujem"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "Som na túre"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Hrám sa"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Som vonku"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Žúrujem"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Čítam"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Nacvičujem"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Nakupujem"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "Lyžujem"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Mám spoločnosť"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Opalujem sa"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Sledujem TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Sledujem film"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Rozprávam"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "Bezprostredne"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Telefonujem"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Mám videohovor"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Cestujem"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Prichádzam"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Šoférujem"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "V aute"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "V autobuse"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "V lietadle"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "Vo vlaku"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "Na výlete"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Prechádzam sa"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Kódim"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "Na stretnutí"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Študujem"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Píšem"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Neznámy umelec"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Neznámy titulok"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Neznámy zdroj"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
+"z <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5828,35 +5849,11 @@ msgstr ""
 "[Toto je časť šifrovanej relácie. Ak vidíte túto správu, potom je niečo "
 "nesprávne.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passfráza nebola zadaná"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Budete pripojený k %s bez OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Pre pokračovanie odosielania a prijímania správ, sa musíte znovu pripojiť."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5865,53 +5862,44 @@ msgstr ""
 "%s\n"
 "Link-local správy nemusia správne fungovať."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Prosím skontrolujte, či je nainštalovaný program Avahi alebo Bonjour."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Nie je možné spustiť lokálnu službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie je možné použiť port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Prosím skontrolujte, či je spustený program avahi-daemon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie je možné zmeniť stav účtu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Nie ste pripojený alebo viditeľný pre ostatných. Vašu správu nie je možné "
-"odoslať."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Táto správa je šifrovaná]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Vašu správu nie je možné odoslať."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je odhlásený. Vašu správu nie je možné odoslať."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5924,24 +5912,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Chyba pri pridávaní služby. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Predvolená správa"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Povolené"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pre jazyk %s nie je k dispozícii"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5951,218 +5939,218 @@ msgstr ""
 "pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
 "nastavením premennej setting the speller_language."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "text správy o stave"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Prihlásiť znovu?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ak chcete, aby boli všetky zmeny naraz aplikované, musíte sa znovu prihlásiť."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Neprečítané udalosti"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Prečítať všetky správy pred odstránením tohoto účtu."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Máte otvorený rozhovor pod účtom %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený na server"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "Pre zmenu názvu účtu, musíte mať prečítané všetky čakajúce správy."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už použitý"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tento názov je už použitý jedným z vašich účtov. Prosím, zvoľte si iný názov."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Premenovať účet"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadať nový názov pre účet %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí byť v tvare \"používateľ@menoserveru\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Vlastný port musí byť číslo portu."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Vznikol problém pri získavaní vášho OpenPGP tajného kľúča."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť meniť vaše osobné "
 "informácie."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený k serveru"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Server nepodporuje Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumožňuje uloženie vašich osobných informácií."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Prosím, premenujte alebo odstráňte to pred zapnutím link-local správ."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6170,11 +6158,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6182,11 +6170,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6194,17 +6182,17 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6221,58 +6209,59 @@ msgstr ""
 "4. doména (doména sama o sebe, ľubovoľný používateľ@doména,\n"
 "doména/zdroj, alebo adresa obsahujúca subdoménu."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?zobrazovaný stav:All"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Len vstúpiť a vystúpiť"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?zobrazovaný stav:None"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Nová diskusná skupina"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6280,29 +6269,29 @@ msgstr ""
 "odstráňte túto záložku."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Prezývka nie je povolená: %s"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6312,32 +6301,32 @@ msgstr ""
 "Môžete nastaviť pokročilé vlastnosti účtu stlačením tlačidla Pokročilé, "
 "alebo neskôr zvolením položky Účty v menu Upraviť v hlavnom okne."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol úspešne vytvorený"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Musíte vložiť meno používateľa pre konfuguráciu tohoto účtu."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Poskytnite, prosím, server na ktorom sa chcete zaregistrovať."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Certifikát už v súbore"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Tento certifikát je práve v súbore %s, preto nebude znova pridaný."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6352,7 +6341,7 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6363,70 +6352,70 @@ msgstr ""
 "SHA1 fingerprint certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Vyskytla sa chyba počas tvorby účtu"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Názov účtu je už používaný"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Ďalšia prijatá správa zameraná"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Ďalšia prijatá správa nezameraná"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt pripojený"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Prijatý GMail e-mail"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6434,226 +6423,224 @@ msgstr ""
 "Zatiaľ čo ste nevenovali pozornosť tejto diskusnej skupine, pribudol "
 "nasledujúci text, ktorý je pod čiarou"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "_Koniec"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcie pre \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _slovníku"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chýba \"%s\" a to nie je WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Otvoriť ako _odkaz"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Včera"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "Pred %i dňami"
+msgid_plural "%i days ago"
+msgstr[0] "Včera"
+msgstr[1] "Včera"
+msgstr[2] "Včera"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber Id je už v zozname"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "nové@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nové%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktné meno: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "V skupine"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "ID kľúča"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Meno kontaktu"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Nastaviť náladu"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s správa o stave"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Prepísať správu o stave?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Tento názov je už použitý. Chcete prepísať túto správu o stave?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Uložiť ako prednastavenú správu o stave"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG číslo:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ číslo:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať do účtu %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Nespravné ID používateľa"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Nemôžete pridať seba do vášho zoznamu kontaktov."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klient"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Verzia GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Verzia PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Súčasní vývojári:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "POĎAKOVANIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "V neposlednom rade ďakujeme všetkým správcom balíkov."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Peter Trško (dogmat AT dogmat.us)\n"
 "Pavol Klačanský <pavol@klacansky.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6662,98 +6649,102 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Prezývka obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Požiadavka na zápis pre účet %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už ste v diskusnej skupine %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť sa k diskusnej skupine s účtom %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Nesprávne Jabber ID diskusnej skupiny"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Toto nie je diskusná skupina"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie je názov diskusnej skupiny."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Tento účet nie je pripojený k serveru"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemôžete sa synchronizovať s kontaktom ak nie je prihlásený."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synchronizovať"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6762,300 +6753,329 @@ msgstr ""
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Nesprávne JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie je možné spracovať \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí sa musia zhodovať."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nová správa"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nová krátka správa"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Nová súkromná správa"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Nový e-mail"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakt zmenil stav"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Krátka správa s použitím účtu %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Krátka správa v účte %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Krátku správu"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, 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:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML konzola"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Smutný"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Náladový"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "O_dstrániť"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "Chcem si vás pridať do môjho zoznamu kontaktov."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "Náladový"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "Skupina"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Chcem si vás pridať do môjho zoznamu."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Pridať kontakt"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Odstráni kontakt zo zoznamu"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Súkromný zoznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Súkromný zoznam pre %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Poradie: %(order)s, akcia: %(action)s, typ: %(type)s, hodnota: %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Poradie: %(order)s, akcia: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upraviť pravidlo</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Pridať pravidlo</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Súkromné zoznamy pre %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Súkromné zoznamy"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Nesprávny názov zoznamu"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte vložiť názov, aby bolo možné vytvoriť nový súkromný zoznam."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete prijať pozvanie?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Vybrať obrázok"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Keď %s sa stane:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Pridáva sa špeciálne upozornenie pre %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Podmienka"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "keď som "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7063,38 +7083,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu overená"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Overiť znovu..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NEoverená"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Overiť..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Overili ste identitu kontaktu?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7104,33 +7124,52 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, fuzzy, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 #, fuzzy
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr "=="
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 #, fuzzy
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr "=="
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Ostatný"
@@ -7140,24 +7179,24 @@ msgstr "Ostatný"
 msgid "Conference"
 msgstr "Konferencia"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehliadať dostupné služby"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehliadanie služieb s použitím účtu %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Prehliadanie služieb"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7165,240 +7204,240 @@ msgstr ""
 "Žiadna služba nie je k dispozícii na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste opäť."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Služba nie je prehľadávateľná"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žiadne položky na prehľadávanie."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Neplatný názov servera"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prehliadanie %(address)s s použitím účtu %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Prehliadať"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky na prehliadanie."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Vykonať príkaz"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Prieskúmava sa %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Používatelia"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Diskusná skupina \"%s\" je už vo vašich záložkách."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Prihlásiť"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr ""
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Nová správa"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 #, fuzzy
 msgid "SSL certificat validation"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Knižnica používaná k overeniu serverových certifikátov, kvôli zaisteniu "
 "bezpečného pripojenia."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Vyžaduje python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Vyžaduje python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Vyžaduje pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "Príkazy: %s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Skript na ovládanie programu Gajim cez príkazový riadok."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Vyžaduje python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Funkcia nie je dostupná pod Windows."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Šifruje správy rozhovoru pomocou gpg kľúčov."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Vyžaduje gpg a python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Automaticky zistí stav siete."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Vyžaduje gnome-network-manager a python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Správa sedenia"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Sedenie Gajim bude uložené pri odhlásení a obnovené pri prihlásení."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Vyžaduje python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "Heslo pre vstup do miestnosti"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Heslá môžu byť bezpečne uložené a nie sú v obyčajnom texte."
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Vyžaduje gnome-keyring a python-gnome2-desktop."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Schopnosť pripojiť sa k serverom, ktoré používajú SRV protokoly."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Vyžaduje dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Vyžaduje nslookup k použitiu SRV protokolov."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Kontrola pravopisu"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Kontrolovať pravopis vo vytvorených správach."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 #, fuzzy
 msgid "Requires libgtkspell."
 msgstr "Vyžaduje python-sexy."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "Upozornenia"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Nereagujúce vyskakovacie upozornenia pre nové udalosti."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7406,53 +7445,34 @@ msgstr ""
 "Vyžaduje python-notify alebo instead python-dbus v spojení s notification-"
 "daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Trayikona"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Ikona v oblasti systémových upozornení odráža prítomnosť."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Vyžaduje python-gnome2-extras alebo skompilovaný modul trayicon zo "
-"zdrojových kódov Gajim."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Vyžaduje PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Upraviť stav"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Schopnosť odhadnúť čas nečinnosti v nastavení poradia automatických stavov."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Vyžaduje python-gnome2."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Prevádza LaTeX výrazy medzi $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 #, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
@@ -7461,7 +7481,7 @@ msgstr ""
 "Vyžaduje texlive-latex-base, dvips a imagemagick. Nastavte 'use_latex' na "
 "pravda v Editor rozšírenej konfigurácie."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 #, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
@@ -7470,25 +7490,25 @@ msgstr ""
 "Vyžaduje texlive-latex-base, dvips a imagemagick. Nastavte 'use_latex' na "
 "pravda v Editor rozšírenej konfigurácie."
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "End to End šifrovanie"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Šifrovanie správ rozhovorov."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Vyžaduje python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST generátor"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7496,25 +7516,38 @@ msgstr ""
 "Generuje XHTML z výstupu RST kódu (pozrite http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Vyžaduje python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Schopnosť spraviť klikacie URL v titulkoch okien rozhovorov a diskusných "
 "skupín."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Vyžaduje python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Vyžaduje python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Funkcia"
 
@@ -7530,140 +7563,140 @@ msgstr "Čas"
 msgid "Progress"
 msgstr "Stav"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Názov súboru: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Veľkosť: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Príjemca: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uložené do: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Prenos súboru bol zrušený"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Spojenie s druhou stranou nie je možné nadviazať."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Príjemca: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová správa: %s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Vyberte súbor na odoslanie..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Popis:"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemôže pristupovať k tomuto súboru"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Tento súbor je používaný iným procesom."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Súbor: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie je možné prepísať existujúci súbor \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Súbor s rovnakým názvom už existuje a nemáte oprávnenie na jeho prepísanie."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Čo si prajete vykonať?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Do priečinku \"%s\" nie je možné zapisovať"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáte oprávnenie vytvoriť súbor v tomto priečinku."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Uložiť súbor ako..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7671,32 +7704,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Nesprávny súbor"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Súbor:"
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Meno: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Odosielateľ: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pozastaviť"
 
@@ -7767,11 +7800,11 @@ msgstr ""
 "získať na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim už beží"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7779,503 +7812,78 @@ msgstr ""
 "Pravdepodobne už jeden program Gajim beží\n"
 "Želáte si aj napriek tomu spustiť Gajim?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Passfráza je požadovaná"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "CRL vypršal"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Budete pripojený k %s bez OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Nesprávna passfráza"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Prijať túto požiadavku?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr ""
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "Overenie HTTP (%(method)s) pre %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Spojenie zlyhalo"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Chyba %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Požiadavka o zapísanie"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorizácia akceptovaná"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr ""
-"Kontakt \"%s\" vás autorizoval, aby ste mohol vidieť jeho alebo jej stav."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Budete vždy vidieť jeho alebo ju ako neprihlásený.\n"
-"Chcete odstrániť jeho alebo ju zo zoznamu kontaktov?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Odhlásiť"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Spojenie s \"%s\" nie je možné nadviazať"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s je známy ako %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s je teraz %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s má nastavený predmet na %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Zaznamenávanie miestnosti je teraz povolené"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Zaznamenávanie miestnosti je teraz zakázané"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Miestnosť je teraz neanonymná"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Miestnosť je teraz poloanonymná"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Miestnosť je teraz anonymná"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Pre prihlásenie do miestnosti %s je potrebné heslo. Zadajte ho, prosím."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Nastavili ste Gajim aby používal GPG agenta, ale tu nie je žiadny spustený "
-"GPG agent alebo vrátil nesprávne heslo.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Vaša passfráza je nesprávna"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Vaša passfráza je nesprávna"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG je nepoužitelný"
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Znovu sa už _nepýtať"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Správca zväzku kľúčov je nainštalovaný, ale \t\t\t\t\t\t\tnesprávne spustený "
-"(pravdepodobne je \t\t\t\t\t\t\tnesprávne nastavená premenná prostredia)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nový e-mail %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Od: %(from_address)s\n"
-"Predmet: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s vám chce poslať súbor."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Odstráni kontakt zo zoznamu"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Chyba čítania súboru:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Úspešne prijatý súbor %(filename)s od %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Nepodarilo sa dešifrovať správu"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Konflikt používateľských mien"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Chyba."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Konflikt zdroju"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Chyba overovania SSL certifikátu"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignorovať túto chybu pre tento certifikát."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Chyba SSL certifikátu"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Vyzerá to že bol zmenený SSL certifikát alebo vaše pripojenie bolo "
-"hacknuté.\n"
-"Starý odtlačok: %(old)s\n"
-"Nový odtlačok: %(new)s\n"
-"\n"
-"Chcete sa predsa len pripojiť a aktualizovať odtlačok certifikátu?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Nezabezpečené spojenie"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Ste si istý, "
-"že to chcete urobiť?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
-"tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Emotikony zakázané"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-"Vami nastavená téma emotikôn nebola nájdená, takže emotikony budú zakázané."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Vami nastavená téma emotikon nemôže byť nahratá. Môžno potrebujete "
-"aktualizovať formát súboru emoticons.py. Pre viac podrobností pozrite http://"
-"trac.gajim.org/wiki/Emoticons."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ ste neviditeľný"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Nie je možné uložiť nastavenia"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Zobrazí pomocníka pre daný príkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "príkaz"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "ukáž pomocníka pre príkaz"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Zobraziť alebo skryť okno so zoznamom"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "zobraziť len kontakty daného účtu"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše zoznam registrovaných účtov"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
 "neviditeľný"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "správa"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "správa o stave"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8283,22 +7891,22 @@ msgstr ""
 "zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
 "účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Priori_ta:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Chcem si za_registrovať nový účet"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8307,23 +7915,23 @@ msgstr ""
 "zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
 "účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazí diskusné okno, takže môžete odoslať správu kontaktu"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, s ktorým chcete komunikovať"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ak je špecifikované, kontakt je zobraný zo zoznamu pre tento účet"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8333,30 +7941,30 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "obsah správy"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp kľúč"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ak je špecifikovaný, správa bude zašifrovaná s použitím verejného kľúča"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "ak je špecifikovaný, správa bude odoslaná s použitím tohoto účtu"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8366,136 +7974,136 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "predmet"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "predmet správy"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Získať podrobné informácie o kontakte"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Získať podrobné informácie o účte"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Názov účtu"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Poslať súbor kontaktu"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "súbor"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "ak je špecifikovaný, súbor bude odoslaný s použitím tohto účtom"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Výpis všetkých nastavení a ich hodnôt"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastavuje hodnotu 'kľúča' na 'hodnotu'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "kľúč=hodnota"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'kľúč' je názov vlastnosti, 'hodnota' je hodnota, na ktorú má byť nastavený"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Odstrániť položku predvoľby"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "kľúč"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "názov nastavenia, ktoré má byť zmazané"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuálny stav nastavení programu Gajim do súboru .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Pridá kontakt do zoznamu"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Pridá nový kontakt do tohto účtu"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vráti aktuálny stav (použije sa globálny, pokiaľ nie je vybraný účet)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Vráti aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
 "účet)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Vráti počet neprečítaných správ"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvorí dialóg 'Začiatok diskusie'"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Začať rozhovor s použitím účtu %s"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Odoslať vlastné XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML na odoslanie"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8503,72 +8111,72 @@ msgstr ""
 "Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
 "všetkým účtom"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Účet ktorý chcete ovládať"
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "obsah správy"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Pripojiť MUC miestnosť"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "miestnosť"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "JID miestnosti"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "prezývka"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Prezývka na používanie"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Heslo pre vstup do miestnosti"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Kontrolovať, či je Gajim spustený"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Zobraziť alebo skryť okno ipython"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8577,15 +8185,15 @@ msgstr ""
 "'%s' nie je vo vašom zozname.\n"
 "Prosím, špecifikujte účet, z ktorého odoslať správu."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Vyzerá že Gajim nebeží. Nemôžete tak použiť gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8594,16 +8202,16 @@ msgstr ""
 "Použitie: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s nenájdený"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8612,7 +8220,7 @@ msgstr ""
 "Použitie: %s príkaz [argumenty]\n"
 "Príkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8621,7 +8229,7 @@ msgstr ""
 "Príliš veľa argumentov. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8630,7 +8238,7 @@ msgstr ""
 "Argument \"%(arg)s\" nie je špecifikovaný. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Nesprávna uri"
 
@@ -8659,170 +8267,194 @@ msgstr "Nemôžete odstrániť súčastnú tému"
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému ako sučastnú."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Rozhovor s "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Pokračovanie rozhovoru"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Zaznamenávanie miestosti je povolené"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Bola vytvorená nová miestnosť"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s bol vykopnutý %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s bol zakázaný %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy ako %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s je známy ako %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "príslušnosť zmenená"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "nastavenie miestnosti sa zmenilo na len členovia"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "vypnutie systému"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rola %(nick)s bola nastavená na %(role)s kontaktom %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rola %(nick)s bola nastavená na %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je teraz %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ak zatvoríte okno, budete odpojený z tejto diskusnej skupiny."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Znovu sa už _nepýtať"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Ničí sa %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Môžete dole špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazujem %s"
@@ -8848,58 +8480,469 @@ msgid "Details"
 msgstr "Podrobnosti"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Chyba čítania súboru:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Chyba štruktúry súboru:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nie je možné zapisovať do %s. Správca sedenia nebude fungovať"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie je štandartným Jabber klientom"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete, aby bol Gajim štandartným Jabber klientom?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Vždy kontrolovať pri spustení, či je Gajim štandartným Jabber klientom"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Rozšírenie nie je podporované"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Obrázok nie je možné uložiť vo formáte %(type)s. Uložiť ako %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Prijať túto požiadavku?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr ""
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Overenie HTTP (%(method)s) pre %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Spojenie zlyhalo"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Chyba %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "Požiadavka o zapísanie"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorizácia akceptovaná"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr ""
+"Kontakt \"%s\" vás autorizoval, aby ste mohol vidieť jeho alebo jej stav."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Budete vždy vidieť jeho alebo ju ako neprihlásený.\n"
+"Chcete odstrániť jeho alebo ju zo zoznamu kontaktov?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Odhlásiť"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Spojenie s \"%s\" nie je možné nadviazať"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s má nastavený predmet na %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Zaznamenávanie miestnosti je teraz povolené"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Zaznamenávanie miestnosti je teraz zakázané"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Miestnosť je teraz neanonymná"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Miestnosť je teraz poloanonymná"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Miestnosť je teraz anonymná"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
+"Pre prihlásenie do miestnosti %s je potrebné heslo. Zadajte ho, prosím."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Nastavili ste Gajim aby používal GPG agenta, ale tu nie je žiadny spustený "
+"GPG agent alebo vrátil nesprávne heslo.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Vaša passfráza je nesprávna"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Vaša passfráza je nesprávna"
+
+#: ../src/gui_interface.py:1170
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG je nepoužitelný"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Správca zväzku kľúčov je nainštalovaný, ale \t\t\t\t\t\t\tnesprávne spustený "
+"(pravdepodobne je \t\t\t\t\t\t\tnesprávne nastavená premenná prostredia)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nový e-mail %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Od: %(from_address)s\n"
+"Predmet: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vám chce poslať súbor."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Odstráni kontakt zo zoznamu"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "Chyba čítania súboru:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Úspešne prijatý súbor %(filename)s od %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Nepodarilo sa dešifrovať správu"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Konflikt používateľských mien"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Chyba."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Konflikt zdroju"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s vám chce poslať súbor."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Požiadavka na prenos súboru"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Chyba overovania SSL certifikátu"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignorovať túto chybu pre tento certifikát."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Chyba SSL certifikátu"
+
+#: ../src/gui_interface.py:1906
+#, fuzzy, python-format
+msgid ""
+"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 ""
+"Vyzerá to že bol zmenený SSL certifikát alebo vaše pripojenie bolo "
+"hacknuté.\n"
+"Starý odtlačok: %(old)s\n"
+"Nový odtlačok: %(new)s\n"
+"\n"
+"Chcete sa predsa len pripojiť a aktualizovať odtlačok certifikátu?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Nezabezpečené spojenie"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Ste si istý, "
+"že to chcete urobiť?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
+"tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Emotikony zakázané"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Vami nastavená téma emotikôn nebola nájdená, takže emotikony budú zakázané."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Vami nastavená téma emotikon nemôže byť nahratá. Môžno potrebujete "
+"aktualizovať formát súboru emoticons.py. Pre viac podrobností pozrite http://"
+"trac.gajim.org/wiki/Emoticons."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ ste neviditeľný"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Nie je možné uložiť nastavenia"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Passfráza je požadovaná"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
+
+#: ../src/gui_interface.py:3477
+#, fuzzy
+msgid "GPG key expired"
+msgstr "CRL vypršal"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Budete pripojený k %s bez OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Nesprávna passfráza"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Nová diskusná skupina"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Chcem si vás pridať do svojho zoznamu"
 
@@ -8914,7 +8957,7 @@ msgstr "Kontakty"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Dátum"
 
@@ -8925,7 +8968,7 @@ msgstr "Prezývka"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Správa"
 
@@ -8950,195 +8993,195 @@ msgstr ""
 "\n"
 "V prípade, že zvolite Áno, prosíme o strpenie..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Exportovanie záznamov histórie..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o %(time)s povedal: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
 msgstr[1] "Skutočne chcete odstrániť záznamy vybraného kontaktu?"
 msgstr[2] "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Toto je nevratná operácia."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Skutočne si želáte zmazať vybraných správ?"
 msgstr[1] "Skutočne si želáte zmazať vybranú správu?"
 msgstr[2] "Skutočne si želáte zmazať vybrané správy?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "História konverzácie s %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 #, fuzzy
 msgid "Disk Error"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Chybová správa: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 #, fuzzy
 msgid "Error"
 msgstr "Chyba."
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Vypršal čas nahrávania obrázku"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Obrázok je príliš veľký"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Nie ste pripojený k serveru"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Skutočne si želáte zmazať vybraných správ?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Diskusné skupiny"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Správy"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- správy budú zaznamenané"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- správy nebudú zaznamenané"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmenil stav"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s sa prihlásil"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s sa odhlásil"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová správa od %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová súkromná správa od diskusnej skupiny %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr ""
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Správa od %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "_Ignorovať"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Získava sa profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Súbor je prázdny"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Súbor neexistuje"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Nie je možné načítať obrázok"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informácie prijaté"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez pripojenie nemôžete publikovať informácie o vašom kontakte."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Odosielanie profilu..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informácie neboli zverejnené"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9146,47 +9189,52 @@ msgstr ""
 "Nastala chyba pri zverejňovaní vašich osobných údajov, skúste to prosím "
 "neskôr."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Zlúčené účty"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Ak \"%s\" akceptuje túto požiadavku, budete vidieť jeho alebo jej stav."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Odteraz vás \"%s\" uvidí len v stave odhlásený."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelný"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Budete pripojený k %s bez OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Ste v jednej alebo viacerých diskusných skupinách"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9195,28 +9243,28 @@ msgstr ""
 "diskusných skupín. Ste si skutočne istý, že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9224,16 +9272,16 @@ msgstr ""
 "Správu bude možné prečítať neskôr len vtedy, ak máte povolenú históriu a "
 "kontakt je vo vašom zozname kontaktov."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Musíte si ich prečítať pred odstránením tohoto transportu."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9241,11 +9289,11 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transport bude odstránený"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9254,71 +9302,71 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport: %s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Premenovať kontakt"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadať novú prezývku pre kontakt %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Premenovať skupinu"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadať nové meno skupiny %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Odstrániť skupinu"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chcete skutočne odstrániť skupinu %s zo zoznamu kontaktov?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 "Tiež odstráni všetky kontakty v tejto skupine z vášho zoznamu kontaktov"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9327,11 +9375,11 @@ msgstr ""
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9339,16 +9387,16 @@ msgstr ""
 "Odstránením tohto kontaktu, automaticky odstránite aj autorizáciu, to "
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9358,7 +9406,7 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -9366,27 +9414,27 @@ msgstr ""
 "Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Server nepodporuje ukladanie metakontaktov"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9394,25 +9442,25 @@ msgstr ""
 "Váš server nepodporuje ukladanie informácií metakontaktov. Tak tieto "
 "informácie nebudú uložené pri ďalšom prihlásení."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Neplatná URI súboru:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9420,12 +9468,12 @@ msgstr[0] "Chcete poslať tieto súbory účtu %s:"
 msgstr[1] "Chcete poslať tento súbor účtu %s:"
 msgstr[2] "Chcete poslať tieto súbory účtu %s:"
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Poslať %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Poslať súbor kontaktu"
@@ -9435,157 +9483,157 @@ msgstr "Poslať súbor kontaktu"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "použiť účet %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Spravovať záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Hudba"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Nastavovať služby..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Maximalizovať všetko"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Poslať sprá_vu skupine"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Všetkým používateľom"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "S_pravovať kontakty"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Upraviť _skupiny"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Poslať krátku správu"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "S_pravovať transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Upraviť transport"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "O_dpojiť"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "O_dpojiť"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Správca histórie"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Zmeniť správu o stave..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Čakám na výsledky"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Žiadny výsledok"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Predmet: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Potvrdiť tieto voľby relácie"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9595,7 +9643,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9610,116 +9658,116 @@ msgstr ""
 "\n"
 "Pokračovať s reláciou?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Zmeniť správu o stave..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tejto diskusnej skupiny"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [blokovaný]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Posledný stav: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Pripojený"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Odpojený"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Zápis: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Pieseň:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Nahrať"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Prenesené:"
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Nezačal"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Zastavený"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Dokončený"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?stav prenosu:Pozastavené"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Prenášanie"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9727,29 +9775,29 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pričlenenie:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9757,7 +9805,7 @@ msgstr ""
 "Tento kontakt sa zaujíma o vaše informácie o prítomnosti, ale vy sa "
 "nezaujímate o jeho/jej informácie o prítomnosti"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9765,12 +9813,12 @@ msgstr ""
 "Zaujímate sa o informácie o prítomnosti vášho kontaktu, ale on/ona sa "
 "nezaujíma o vaše"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9778,18 +9826,65 @@ msgstr ""
 "Nezaujímate sa o informácie o prítomnosti vášho kontaktu a ani on/ona sa "
 "nezaujíma o vaše"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čakáte na odpoveď od kontaktu ohľadne vašej požiadavky na zápis"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " zdroj s prioritou "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Prichádzajúca správa:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Odchádzajúca správa:"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-close"
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "OpenPGP passfráza nebola zadaná"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Pre pokračovanie odosielania a prijímania správ, sa musíte znovu pripojiť."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Nie ste pripojený alebo viditeľný pre ostatných. Vašu správu nie je možné "
+#~ "odoslať."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Táto správa je šifrovaná]"
+
+#~ msgid "%i days ago"
+#~ msgstr "Pred %i dňami"
+
+#~ msgid "Trayicon"
+#~ msgstr "Trayikona"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Ikona v oblasti systémových upozornení odráža prítomnosť."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Vyžaduje python-gnome2-extras alebo skompilovaný modul trayicon zo "
+#~ "zdrojových kódov Gajim."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Vyžaduje PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Pridať špeciálne _upozornenie"
 
diff --git a/po/sr.po b/po/sr.po
index 083143a6d..22c11c8d1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-20 00:04+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-10-29 23:50+0100\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -96,7 +96,7 @@ msgstr "<b>Молимо одаберите сервер</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -107,9 +107,8 @@ msgstr ""
 "SHA1 потпис сертификата:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Користи аутентикацију"
+msgstr "Анон_имно пријављивање"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -283,9 +282,9 @@ msgstr "Измени личне информације"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Гајим"
 
@@ -294,9 +293,9 @@ msgstr "Гајим"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Опште"
 
@@ -356,21 +355,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Информације о Вама, како су ускладиштене на серверу"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Није одабран ниједан кључ"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Ништа"
 
@@ -475,18 +474,16 @@ msgid "<b>Proxy</b>"
 msgstr "<b>Прокси</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
-msgstr "_Подеси према статусу"
+msgstr "По_деси према статусу"
 
 #: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Налози"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Користи аутентикацију"
+msgstr "Анонимно пријављивање"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -497,7 +494,6 @@ msgstr ""
 "везе."
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
 msgstr "По_вежи се приликом покретања Гајима"
 
@@ -526,8 +522,8 @@ msgstr ""
 "Могли бисте узети у обзир и могућност измене подешавања firewall-а."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Џабер ИД:"
 
@@ -541,57 +537,47 @@ msgid "Mer_ge accounts"
 msgstr "_Споји налоге"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Преи_менуј"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
-msgstr "Шаљи податке о живости"
+msgstr "Шаљи подат_ке о живости"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
-msgstr "Синхронизирај статус налога са глобалним статусом"
+msgstr "Синхрони_зуј статус налога са глобалним статусом"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use G_PG Agent"
-msgstr "Користи GPG агента"
+msgstr "Користи G_PG агента"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
-msgstr "Користи Ваше одређено име хоста/порт "
+msgstr "К_ористи Ваше одређено име хоста/порт "
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Користи свој порт:"
+msgstr "К_ористи свој порт:"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "Измени личне информације"
+msgstr "Изм_ени личне информације..."
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Омогући"
+msgstr "_Омогући"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
-msgstr "Име хоста:"
+msgstr "Име _хоста:"
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Подеси..."
+msgstr "_Подеси..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
 msgstr "_Порт:"
 
@@ -600,9 +586,8 @@ msgid "_Warn before using an insecure connection"
 msgstr "Упозори пре коришћења несигурне везе"
 
 #: ../data/glade/accounts_window.glade.h:63
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
-msgstr "користи HTTP_PROXY променљиву окружења"
+msgstr "користи HTTP_PROXY променљив_у окружења"
 
 #: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
@@ -948,7 +933,7 @@ msgstr "Задњи пут измењено:"
 msgid "New entry received"
 msgstr "Нов догађај примљен"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Примили сте нови унос:"
 
@@ -992,11 +977,11 @@ msgstr "Унесите нову лозинку:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Упишите Вашу нову статусну поруку</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Активност:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Расположење:"
 
@@ -1076,9 +1061,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Придружи Open_PGP Кључ..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Изврши наредбу..."
+msgstr "И_зврши наредбу..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1086,8 +1070,8 @@ msgstr "Измени _групе..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "Позо_ви у"
 
@@ -1100,8 +1084,8 @@ msgid "Remo_ve"
 msgstr "_Уклони"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Пошаљи кориснички дефинисан статус"
 
@@ -1134,8 +1118,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Дозволи му/јој да види мој статус"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Блокирај"
 
@@ -1146,7 +1130,7 @@ msgstr "_Забрани му/јој да види мој статус"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Историјат"
 
@@ -1167,8 +1151,8 @@ msgid "_Subscription"
 msgstr "_Претплата"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Одблокирај"
 
@@ -1256,7 +1240,7 @@ msgstr ""
 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:820
 msgid "_Continue"
 msgstr "_Настави"
 
@@ -1264,7 +1248,7 @@ msgstr "_Настави"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Обавести ме када се заврши пренос датотеке"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Отвори садржавајућу фасциклу"
 
@@ -1292,7 +1276,7 @@ msgstr ""
 "Ред контаката\n"
 "Банер разговора"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Подебљано"
 
@@ -1312,11 +1296,11 @@ msgstr "Персонализација Гајим тема"
 msgid "Gone"
 msgstr "Отишао"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Неактивно"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Курзив"
 
@@ -1364,7 +1348,7 @@ msgstr "Промени _тему..."
 msgid "Configure _Room..."
 msgstr "Подеси _собу..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Маркирај ову со_бу"
 
@@ -1452,8 +1436,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добродошли у Гајимов менаџер дневника историјата</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Обриши"
 
@@ -1483,7 +1468,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Претражи базу података"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Историјат разговора"
 
@@ -1507,11 +1492,10 @@ msgid "_Log conversation history"
 msgstr "_Памти у дневнику историјат разговора"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "_Маркирај ову собу (Ctrl+B)"
+msgstr "Маркирај ову собу"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Придружи се групном разговору"
 
@@ -1538,8 +1522,8 @@ msgstr "Недавно:"
 msgid "Room:"
 msgstr "Соба:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Придружи се"
 
@@ -1568,7 +1552,7 @@ msgstr "Умањи прозор на ауто повезивање"
 msgid "Print status:"
 msgstr "Испис статуса:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -1597,14 +1581,14 @@ msgid "<b>Settings</b>"
 msgstr "<b>Подешавања</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
 msgstr ""
 "HTTP спој\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1615,32 +1599,28 @@ msgid "Pass_word:"
 msgstr "Лозинка:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Прокси:"
+msgstr "Прокси _хост:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Порт:"
+msgstr "Прокси _порт:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
-msgstr ""
+msgstr "Кор_исти HTTP прокси"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Користи аутентикацију"
+msgstr "Користи прокси пријављивање"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
-msgstr ""
+msgstr "_BOSH адреса:"
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Врста:"
+msgstr "Врс_та:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
@@ -1679,22 +1659,30 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Прикажи листу смајлија (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
-#, fuzzy
 msgid "Show a list of formattings"
-msgstr "Прикажи листу смајлија (Alt+M)"
+msgstr "Прикажи листу форматирања"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Прикажи мени напредних функција (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Прикажи профил контакта (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Пошаљи"
 
@@ -1793,7 +1781,7 @@ msgstr ""
 
 #: ../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:"
@@ -1826,6 +1814,16 @@ msgid "Configure color and font of the interface"
 msgstr "Конфигурисање боје и фонта интерфејса"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Порука разговора:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Име контакта"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1839,31 +1837,31 @@ msgstr ""
 "Откачена листа контаката са разговорима груписаном по налозима\n"
 "Откачена листа контаката са разговорима груписаном по типу"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Прикажи активности контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Прикажи додатне е-мејл детаље"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Прикажи _песме контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Прикажи _аватаре контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Прикажи _расположења контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Прикажи статусне поруке контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1873,7 +1871,7 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се приказивати у "
 "прозорима разговора."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1883,7 +1881,7 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се слати другој "
 "особи."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1891,11 +1889,11 @@ msgstr ""
 "Гајим ће Вас обавестити о контактима који су се управо одјавили са искачућим "
 "прозором у доњем десном углу екрана"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Сакриј сву дугмад у прозору разговора"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1903,7 +1901,7 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1911,14 +1909,14 @@ msgstr ""
 "Ако је означена, Гајим ће уједно укључити и информације о пошиљаоцу нових е-"
 "мејлова"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ако је означена, Гајим ће аутоматски променити статус у Одсутан када рачунар "
 "није у употреби."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1926,7 +1924,7 @@ msgstr ""
 "Ако је означена, Гајим ће променити статус у Недоступан када рачунар још "
 "дуже није у употреби"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1934,7 +1932,7 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати аватаре контаката у листи контаката и "
 "у групним разговорима"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1942,25 +1940,25 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати статусне поруке контаката испод имена "
 "контакта у листи контаката и у групним разговорима"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати активности контаката у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати расположење контаката у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати песме контаката у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1971,7 +1969,7 @@ msgstr ""
 "поље за унос, подразумевани језик ће бити коришћен за овај контакт или "
 "групни разговор."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1980,7 +1978,7 @@ msgstr ""
 "Ако је означена, Гајим ће игнорисати све долазне догађајеКористите са "
 "опрезом, блокираће све поруке које долазе од људи ван Ваше листе контаката"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1990,7 +1988,7 @@ msgstr ""
 "када се користи E2E енкрипција, друга страна мора да се сложи са чувањем "
 "дневника, у супротном се поруке неће памтити."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1998,7 +1996,7 @@ msgstr ""
 "Ако је означена, Гајим ће приказати поруку када се прими нови е-мејл преко "
 "GMail-амејлова"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2007,7 +2005,7 @@ msgstr ""
 "Ако је означено, Гајим ће користити статусне иконе специфичне за протокол. "
 "(нпр. контакт са МСН-а ће имати мсн иконе за своје статусе)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2015,7 +2013,7 @@ msgstr ""
 "Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
 "подразумевана порука ће бити коришћена."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2023,50 +2021,53 @@ msgstr ""
 "Ако није онемогућено, Гајим ће заменити ascii смајлије као нпр. ':)' са "
 "еквивалентним анимираним или статичним графичким смајлијима"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Уписуј у дневник шифроване сесије разговора"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Начини прозор поруке компактним"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Поде_си..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Никад\n"
+"Само за догађаје на чекању\n"
+"Увек"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Обавештења"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Обавести ме о контактима који се _пријаве"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Обавести ме о контактима који се _одјаве"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Обавести ме о новопристиглој Гмаил е-мејл пошти"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Лични догађаји"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Пуштај звукове"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2076,24 +2077,23 @@ msgstr ""
 "Обавести ме о томе\n"
 "Прикажи само у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Подешавања"
 
-#: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
-msgstr "Прикажи догађај у системској касети"
+msgstr "Прикажи у системској касети:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Пријављивању"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Одјављивању"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2101,145 +2101,149 @@ msgstr ""
 "Неке поруке могу укључивати богати садржај (форматирање, боје итд.). Ако је "
 "означено, Гајим ће само приказивати сирови текст поруке."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Сортирај контакте по статусу"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Скуп статусних икона:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Стил"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "Т_ема:"
 
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:95
 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 ""
-"Ауто статусна порука при одсутности. Ако је празно, Гајим неће изменити "
-"тренутну статусну поруку"
+"Аутоматска статусна порука при одсутности. Ако је празно, Гајим неће "
+"изменити тренутну статусну поруку\n"
+"$S ће бити замењено претходном статусном поруком\n"
+"$T ће бити замењено са временом одсутности"
 
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:98
 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 ""
-"Ауто статусна порука при недоступности. Ако је празно, Гајим неће изменити "
-"тренутну статусну поруку"
+"Аутоматска статусна порука при недоступности. Ако је празно, Гајим неће "
+"изменити тренутну статусну поруку\n"
+"$S ће бити замењено претходном статусном поруком\n"
+"$T ће бити замењено са временом недоступности"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Користи иконе за _транспорте"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Користи системски подразумевано"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Када се прими нови догађај:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Порука грешке: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Надимак:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "Аутом_атски одсутан после:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Интернет прегледач:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "_Приказана обавештења о стању разговора:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Смајлији:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Прегледач датотека:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Обоји погрешно написане речи"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнориши догађаје од контаката који нису на листи"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Игнориши богато форматирани садржај у пристиглим порукама"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Долазна порука:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Записуј у дневник статусне промене контаката"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Е-мејл клијент:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "Аутоматски _недоступан након:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Отвори..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Одлазна порука:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Поново учитај подразумеване боје"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "Пошаљи обавештења о стању разговора:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Статусна порука:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "URL осветљавање:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "Понашање прозора:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "у _групним разговорима"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "у _листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "минута"
 
@@ -2272,9 +2276,8 @@ msgid "All"
 msgstr "Сви"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "све према претплати"
+msgstr "Све (укључујући и претплате)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2292,7 +2295,7 @@ msgstr "Џабер ИД"
 msgid "Order:"
 msgstr "Поредак:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Листа приватности"
 
@@ -2436,7 +2439,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Префикс:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Улога:</b>"
 
@@ -2496,8 +2499,8 @@ msgstr "Уклони налог и из Гајима и са сервера"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Уклони"
 
@@ -2506,24 +2509,25 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>неко@домаћин.com</b> жели да <b>додате</b> неке контакте у листу "
+"контаката."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Тело поруке <тренутно се не користи, па је подразумевано сакривено>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Размена ставки контаката"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_У реду"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-close"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2550,9 +2554,8 @@ msgid "Profile, A_vatar"
 msgstr "Профил, А_ватар"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Прикажи контакте који нису на вези"
+msgstr "Прикажи само _активне контакте"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2581,7 +2584,7 @@ msgstr "_Акције"
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Измени"
 
@@ -2622,11 +2625,11 @@ msgid "_Add contact"
 msgstr "Додај _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "Информације"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Претрага"
 
@@ -2646,10 +2649,6 @@ msgstr "Региструј се на"
 msgid "_Cancel"
 msgstr "_Одустани"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_У реду"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "О"
@@ -2754,9 +2753,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Клијент:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>Покрајина:</b>"
+msgstr "<b>Време контакта на вези:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
@@ -2855,283 +2853,265 @@ msgstr "Ресурс:"
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Поништи одобравање"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Тренутно извршавате команду. Да ли желите да је прекинете?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Сервис је послао лоше податке"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Сервис је изменио идентификатор сесије."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Сервис је вратио грешку."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Активирано"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Деактивирано"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Да/Не"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Цео број"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Боја"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Име поставке"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Вредност"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(ништа)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Скривен"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Примили сте нови унос:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Примили сте нове уносе (%(count)d није приказано):"
+msgstr[1] "Примили сте нове уносе (%(count)d није приказано):"
+msgstr[2] "Примили сте нове уносе (%(count)d није приказано):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Енглески"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Белоруски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Бугарски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Бретански"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Чешки"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Немачки"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Грчки"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Британски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Шпански"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Баскијски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Француски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Хрватски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Италијански"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Норвешки (б)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Холандски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Норвешки"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Пољски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Португалски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Бразилски португалски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Руски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Српски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Словачки"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Шведски"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Кинески (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Језик за правопис"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Веза није доступна"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваша порука не може бити послата ако нисте повезани."
 
-#: ../src/chat_control.py:820
-#, fuzzy
+#: ../src/chat_control.py:861
 msgid "Underline"
-msgstr "Недефинисан"
+msgstr "Подвучено"
 
-#: ../src/chat_control.py:821
-#, fuzzy
+#: ../src/chat_control.py:862
 msgid "Strike"
-msgstr "Болестан"
+msgstr "Прецртано"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
-msgstr ""
+msgstr "Фонт"
 
-#: ../src/chat_control.py:853
-#, fuzzy
+#: ../src/chat_control.py:894
 msgid "Clear formating"
-msgstr "Информације контакта"
+msgstr "Очисти форматирање"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Стварно пошаљи датотеку?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ако пошаљете датотеку контакту %s, он/она ће знати Ваш прави џабер ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG енкрипција омогућена"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Није на листи контаката"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "Листа преноса активних, завршених и заустављених датотека"
+msgstr "Овак контакт не подржава пренос датотека."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr ""
+msgstr "Морате знати прави џабер ИД контакта да бисте му/јој послали датотеку."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Непознат извођач"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Непознат наслов"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Непознат извор"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> од <i>%(artist)s</i>\n"
-"из <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, 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:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Нема додељеног GPG кључа"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3139,50 +3119,50 @@ msgstr ""
 "Ниједан GPG кључ није додаљен овом контакту. Не можете шифровати поруке са "
 "GPG-ом."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG енкрипција онемогућена"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Сесија ЋЕ бити памћена"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Сесија НЕЋЕ бити памћена"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "је"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "НИЈЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "ће"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "НЕЋЕ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
-msgstr "и аутентификовани"
+msgstr "и пријављени"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
-msgstr "и НЕаутентификовани"
+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:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3191,48 +3171,48 @@ msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Успостављање сесије прекинуто"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Ова сесија је шифрована"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr "и БИЋЕ памћена"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr "и НЕЋЕ бити памћена"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Идентитет другог корисника није потврђен. Кликните на штит за више детаља."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E енкрипција онемогућена"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Следећа порука НИЈЕ била шифрована"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Следећа порука је била шифрована"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Вам је управо послао поруку"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3240,15 +3220,15 @@ msgstr ""
 "Ако затворите овај језичак, а историјат разговора није омогућен, ова порука "
 "ће бити изгубљена."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3257,7 +3237,7 @@ msgstr ""
 "Датотека базе података (%s) се не може читати. Покушајте да је поправите или "
 "уклоните (сав историјат порука ће бити изгубљен)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s је сада %(status)s"
@@ -3266,23 +3246,23 @@ msgstr "%(name)s је сада %(status)s"
 msgid "creating logs database"
 msgstr "креирам базу дневника"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s је датотека, али би требала бити фасцикла"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Гајим ће се сада завршити"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jе фасцикла, али би требала бити датотека"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "креирам фасциклу %s"
@@ -3345,10 +3325,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Одаберите групне разговоре које желите да напустите"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Групни разговори"
 
@@ -3366,7 +3346,7 @@ msgstr "Све непрочитане поруке су прослеђене."
 
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Пусти звук када је корисник заузет"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3374,7 +3354,7 @@ msgstr "Користи ДБус и демон обавештења за прик
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+msgstr "Прикажи у листи само контакте који су на вези и слободни за ћаскање."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3407,51 +3387,48 @@ msgstr ""
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
+"Када приказати иконицу у системској касети. Може бити 'never', 'on_event', "
+"'always'."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Неисправан надимак"
+msgstr "Боја за долазни надимак."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Боја за одлазни надимак."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Боја долазног текста."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Боја одлазног текста."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "текст статусне поруке"
+msgstr "Боја текста статусне поруке."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Неисправан надимак"
+msgstr "Фонт долазног надимка."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Промена надимка"
+msgstr "Фонт одлазног надимка."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Фонт долазног текста."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Фонт одлазног текста."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "текст статусне поруке"
+msgstr "Фонт текста статусне поруке."
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3460,9 +3437,9 @@ msgstr ""
 "Листа (одвојена бланко знаковима) редова (налога и група) који су отворени."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "подразумевано"
 
@@ -3566,17 +3543,19 @@ msgstr "Колико минута да трају линије претходн�
 
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
-msgstr ""
+msgstr "Колико линија тражити од сервера при уласку на групни разговор."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr ""
+msgstr "Од пре колико минута тражити дневнике при уласку на групни разговор."
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Колико секунди чекати пре поновног аутоматског придруживања соби са које сте "
+"раскачени. Ставити 0 да онемогућите поновно аутоматско придруживање."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3662,6 +3641,9 @@ 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:192
 msgid ""
@@ -3899,26 +3881,24 @@ msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
-"Треба ли питати за потврду стварања псеудоконтакта или не? Празан низ значи "
-"да никада не приказујемо упит."
+"Треба ли питати за потврду стварања псеудоконтакта или не? Празна ниска "
+"значи да никада не приказујемо дијалог."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Треба ли питати за потврду стварања псеудоконтакта или не? Празан низ значи "
-"да никада не приказујемо упит."
+"Треба ли приказивати дијалог за потврду блокирања контакта? Празна ниста "
+"значи да никада не приказујемо дијалог."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Треба ли питати за потврду стварања псеудоконтакта или не? Празан низ значи "
-"да никада не приказујемо упит."
+"Треба ли приказивати дијалог за потврду прилагођеног статуса? Празна ниска "
+"значи да никада не приказујемо дијалог."
 
 #: ../src/common/config.py:259
 msgid ""
@@ -3939,12 +3919,11 @@ msgstr ""
 "ускладишти лозинке налога."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Ако је истинито, Гајим ће користити Гномов Keyring (ако је доступан) да "
+"Ако је истинито, Гајим ће користити КДЕ Новчаник (ако је доступан) да "
 "ускладишти лозинке налога."
 
 #: ../src/common/config.py:262
@@ -4011,29 +3990,34 @@ msgid ""
 msgstr "Промените вредност да промените величину Латекс формула. Више је веће."
 
 #: ../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)"
 msgstr ""
 "Исправне uri шеме. Само шеме са ове листе ће бити прихваћене као \"стварне\" "
-"uri."
+"uri. (mailto и xmpp се обрађују засебно)"
 
 #: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
+"Питај за статусне поруке ван везе за све контакте који нису на вези када се "
+"успостави веза са налогом. УПОЗОРЕЊЕ: ово ће послати много захтева серверу!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Ако је True, допуњавање у групним разговорима ће бити као допуњавање у "
+"конзоли"
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"Када се приказује сопствени контакт. Може бити \"always\", "
+"\"when_other_resource\" or \"never\""
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4060,12 +4044,14 @@ msgstr "Ако је омогућено, постави последњи кори
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
+"Ако је True, контакти који траже ауторизацију ће аутоматски бити прихваћени."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
-msgstr "Ако није истинито, нећете више видети аватар у прозору разговора."
+msgstr ""
+"Ако је False, налог ће бити онемогућен и неће се приказивати у листи "
+"контаката."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4106,19 +4092,18 @@ msgstr "Листа ssl грешака за игнорисање, одвојен�
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Слање белина после неактивности"
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "Слање XMPP пинга после неактивности"
 
 #: ../src/common/config.py:323
-#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
-"Колико секунди чекати на одговор о пкаетима о живости пре него што покушамо "
+"Колико секунди чекати на одговор о пакетима о живости пре него што покушамо "
 "поновно успостављање везе."
 
 #. yes, no, ask
@@ -4126,7 +4111,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 привремено решење"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4134,15 +4119,15 @@ msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Одговор на захтев примања"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Послати захтев примања"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4150,11 +4135,11 @@ msgstr ""
 "Када се успоставља шифрована сесија, да ли Гајим треба да претпостави да "
 "желите да чувате поруке у дневнику?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Да ли је OpenPGP омогућен за овај контакт?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4162,101 +4147,101 @@ msgstr ""
 "Да ли Гајим треба аутоматски да започне шифровану везу са овим контактом "
 "када је могуће?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Језик у коме желите проверавати неисправно написане речи"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "све или размаком одвојен статус"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'да', 'не', или 'обоје'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'да', 'не' или ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Једем"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Једем, оставите поруку."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Радим."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Радим."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Напољу"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4265,99 +4250,97 @@ msgstr ""
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "намирнице"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "људска"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Није могуће учитавање модула idle"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Лош хост"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Невалидна локална адреса? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информације о регистрацији за транспорт %s нису дошле на време"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
-msgstr "Региструј се на %s"
+msgstr "Регистрација успешна"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Регистрација са агентом %s успешна"
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
-msgstr "Веза прекинута"
+msgstr "Регистрација неуспела"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
+"Регистрација са агентом %(agent)s неуспела уз грешку %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Грешка при упису на диск"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Невидљивост није подржана"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Налог %s не подржава невидљивост."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
+msgstr "Порука од неисправног џабер ИД-а, игнорисана је."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4367,7 +4350,7 @@ msgstr ""
 "(погледајте http://trac.gajim.org/wiki/DatabaseBackup) или  уклоните (сав "
 "историјат порука ће бити изгубљен)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Недозвољен надимак: %s "
@@ -4375,76 +4358,76 @@ msgstr "Недозвољен надимак: %s "
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Достигнут највећи број корисника за %s"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Забрањен Вам је приступ овом групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групни разговор.%s не постоји."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Стварање групних разговора Вам није дозвољено."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Морате користити Ваш регистровани надимак у групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, 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:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Соба групног разговора је уништена"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Можете се прикључити соби %s уместо ове"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Желео бих да те додам на моју листу контаката."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "сада сте претплаћени на %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "захтев за укидање претплате од контакта %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "сада Вам је укинута претплата од контакта %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4581,77 +4564,105 @@ msgstr "Употреба кључа не укључује потписивање
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Није могуће послати поруку за %s, овај џабер ИД није исправан."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Нити је удаљено присуство потписано, нити је кључ додељен."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "Кључ контакта (%s) не поклапа се са кључем придруженим у Гајиму."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Ова порука је *шифрована* (Погледајте :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Тема: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Изгубљена веза са рачуном \"%s\""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Поново се повежите ручно."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s је лоше одговорио на захтев регистрације:: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s је понудио другачију форму за регистрацију"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Непозната SSL грешка: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Неисправан одговор"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s је лоше одговорио на захтев регистрације: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Веза са \"%s\" није могућа"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Проверите Вашу конекцију или покушајте касније."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Сачувано у: %s"
+msgstr "Сервер је одговорио: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Веза са проксијем прекинута"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Веза са %s није могућа"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Изгубљена веза са налогом %s. Покушајте поново да се конектујете."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4660,7 +4671,7 @@ msgstr ""
 "\n"
 "SSL грешка: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4669,24 +4680,24 @@ msgstr ""
 "\n"
 "Непозната SSL грешка: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Проверите Вашу конекцију или покушајте касније"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
-msgstr "Аутентикација са \"%s\" неуспешна"
+msgstr "Пријављивање са \"%s\" неуспешно"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Молимо Вас да проверите Ваше корисничко име и лозинку од грешака."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Грешка приликом уклањања листа приватности"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4695,76 +4706,43 @@ msgstr ""
 "Листа приватности %s није уклоњена. Можда је активна у неком од Ваших "
 "ресурса на вези. Деактивирајте је тамо и покушајте поново."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Није могуће послати празну датотеку"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Нити је удаљено присуство потписано, нити је кључ додељен."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Кључ контакта (%s) не поклапа се са кључем придруженим у Гајиму."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Ова порука је *шифрована* (Погледајте :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Тема: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Послати контакти: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Позови контакте"
+msgstr "Послати контакти:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Није дохваћено због статуса невидљивости"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Веза прекинута"
+msgstr "Одјава регистрације неуспела"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+msgstr "Одјава регистрације са сервером %(server)s неуспела: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Посматрачи"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Преноси"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Није у листи контаката"
 
@@ -4780,7 +4758,7 @@ msgstr "D-Bus могућности Гајима се не могу корист�
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus не ради исправно на овом рачунару"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -5011,7 +4989,7 @@ msgstr "Слободан за разговор"
 msgid "_Available"
 msgstr "_Доступан"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Доступан"
 
@@ -5129,48 +5107,48 @@ msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5178,22 +5156,22 @@ msgstr[0] "%d порука чека"
 msgstr[1] "%d порука чекају"
 msgstr[2] "%d порука чека"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " из собе %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " од корисника %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " од %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5201,7 +5179,7 @@ msgstr[0] "%d догађај на чекању"
 msgstr[1] "%d догађаја на чекању"
 msgstr[2] "%d догађај на чекању"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Гајим - %s"
@@ -5217,652 +5195,673 @@ msgid "%s is not a valid loglevel"
 msgstr "%s није исправан ниво логовања"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "грешка: не могу отворити %s за читање"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "цијан"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "пребацујем базу дневника у индексе"
 
 #: ../src/common/passwords.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "налога %s"
+msgstr "XMPP налог %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Уплашен"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Одушевљен"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Заљубљен"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Љут"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Изнервиран"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Анксиозан"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Напаљен"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Посрамљен"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Сморен"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Храбар"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Миран"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Опрезан"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Смрзнут"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Поуздан"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Збуњен"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Задубљен у мисли"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Задовољан"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "На крају живаца"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Луд"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Креативан"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Заинтересован"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Потиштен"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Депресиван"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Разочаран"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Згађен"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Скрхан"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Ометен"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Постиђен"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Завидљив"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Узбуђен"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "За флертовање"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Фрустриран"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Захвалан"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "У патњи"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Мргудан"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Крив"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Срећан"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "У надању"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Наложен"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Скроман"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Понижен"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Гладан"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Повређен"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Импресиониран"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Очаран"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Заљубљен"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Озлојеђен"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Заинтересован"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Отрован"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Непобедив"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Љубоморан"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Усамљен"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Изгубљен"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Срећан"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Злобан"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Расположен"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Нервозан"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Неутралан"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Увређен"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Побеснео"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Играо би се"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Поносан"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Опуштен"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Олакшан"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Самилостан"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Неуморан"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Тужан"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Саркастичан"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Задовољан"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Озбиљан"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Шокиран"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Стидљив"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Болестан"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Поспан"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Спонтан"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Под стресом"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Јак"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Изненађен"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Захвалан"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Жедан"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Уморан"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Недефинисан"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Слаб"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Забринут"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Обавља рутину"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Купује намирнице"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Чисти"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Кува"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Обавља одржавање"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Пере судове"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Пере веш"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Баштовани"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "На задатку"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Шета пса"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Пије"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Пије пиво"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Пије кафу"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Пије чај"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Ужина"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Доручкује"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Руча"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Вечера"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Вежба"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Вози бициклу"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Плеше"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Шета"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Џогира"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Бави се спортом"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Трчи"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Скија"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Плива"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Вежба"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Чешља се"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "У бањи"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Пере зубе"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Шиша се"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Брије се"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Купа се"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Тушира се"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Састанчи"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Слободан дан"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Блеји"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Крије се"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "На одмору"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Моли се"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Заказани одмор"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Размишља"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Одмара се"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Пеца"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Игра игрице"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Излази напоље"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "На проводу"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Чита"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Увежбава"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "У шопингу"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Пуши"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Дружи се"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Сунча се"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Гледа ТВ"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Гледа филм"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Прича"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "У стварном животу"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Телефонира"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "На видео телефону"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Путује"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Мува се"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Вози"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "У колима"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "У аутобусу"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "У авиону"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "У возу"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "На путу"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Шета"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Програмира"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "На састанку"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Учи"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Пише"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Непознат извођач"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Непознат наслов"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Непознат извор"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> од <i>%(artist)s</i>\n"
+"из <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5884,38 +5883,11 @@ msgid ""
 msgstr ""
 "[Ово је део шифроване сесије. Уколико видите ово, нешто је пошло наопако.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Хост %s који сте поставили као ft_add_host_to_send напредно подешавање није "
-"исправан. па је игнорисан."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Лозинка за OpenPGP није унета"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Повезаћете се на %s без OpenPGP кључа."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Ако желите наставити са слањем и примањем порука, морате се искључити и "
-"поново доћи на везу."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Авахи грешка"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5924,52 +5896,44 @@ msgstr ""
 "%s\n"
 "Поруке локалне мреже можда неће радити како треба."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Није могуће покренути локални сервис"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, 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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Молимо проверите да ли је avahi-демон покренут."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Није могуће променити статус рачуна \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Нисте спојени или сте невидљиви за друге. Ваша порука не може бити послата."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Ова порука је шифрована]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Ваша порука није могла бити послата."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт није на вези. Вашу поруку није могуће послати."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5981,24 +5945,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Грешка приликом додавања сервиса. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Онемогућено"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Подразумевана порука"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Омогућен"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Речник за језик %s није доступан"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6007,217 +5971,214 @@ msgstr ""
 "Морате инсталирати %s речник како бисте могли користити проверу правописа, "
 "или одаберите други језик поставком speller_language опције."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "наслов статусне поруке"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "текст статусне поруке"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Отићи са везе и повезати се одмах?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако желите да се све промене тренутно примене, морате да се поново повежете."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP није могуће користити на овом рачунару"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Непрочитани догађаји"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Прочитајте све догађаје на чекању пре уклањања налога."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Отворили сте разговор у рачуну %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Тренутно сте спојени на сервер"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "За промену имена налога, морате отићи са везе."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Да бисте променили име налога, морате прво прочитати све догађаје на чекању."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Име Налога Већ У Употреби"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ово име већ користи један од Ваших налога. Молимо Вас, одаберите друго име."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Неисправно име налога"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Име налога не може бити празно."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Име налога не може да садржи белине."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Преименуј налог"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Унесите ново име за налог%s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Џабер ИД мора бити облика \"корисник@сервер\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Неисправан унос"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Неуспело узимање тајних кључева"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "Дошло је до проблема у узимању Ваших OpenPGP тајних кључева."
+msgstr "Нема доступних OpenPGP тајних кључева."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Одабир OpenPGP Кључева"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Одаберите Ваш OpenPGP кључ"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Није доступан такав налог"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Морате направити Ваш налог пре измена личних информација."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без везе са сервером, није могућа измена личних информација."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не подржава Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може да сачува Ваше личне информације."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "За промену имена налога, морате отићи са везе."
+msgstr "Да бисте онемогућили налог, морате бити раскачени."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Рачун локал већ постоји."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Молимо Вас, преименујте или уклоните пре омогућавања локалних порука."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Измени %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Региструј се на %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Листа забрана"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Листа чланова"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Листа власника"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Листа администратора"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "ЏИД"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Разлог"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Надимак"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Улога"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Забрана..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6225,11 +6186,11 @@ msgstr ""
 "<b>Кога желите забранити?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Додавање члана..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6237,11 +6198,11 @@ msgstr ""
 "<b>Кога желите да поставите чланом?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Додавање власника..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6249,11 +6210,11 @@ msgstr ""
 "<b>Кога желите да поставите за власника?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Додавање администратора..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6261,8 +6222,7 @@ msgstr ""
 "<b>Кога желите да поставите за администратора?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6278,87 +6238,85 @@ msgstr ""
 "4. домен (само се домен поклапа, као и било који корисник@домен,\n"
 "домен/ресурс, или адреса која садржи поддомен."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Уклањање рачуна %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Лозинка захтевана"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Уколико га уклоните, веза ће бити изгубљена."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?испис статуса:Све"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Само ући и напустити"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Нови групни разговор"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Овај маркер има неисправне податке"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Недозвољен надимак: %s "
+msgstr "Карактер није дозвољен"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Неисправан сервер"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Неисправан унос"
+msgstr "Неисправна соба"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Налог је успешно додат"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6367,32 +6325,32 @@ msgstr ""
 "Можете поставити напредна подешавања налога притиском на дугме Напредно, или "
 "касније, кликом на ставку менија Налози под менијем Уреди из главног прозора."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Ваш нови налог је успешно направљен"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Неисправно корисничко име"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Молимо одредите сервер на коме желите да се региструјете."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Сертификат је већ у датотеци"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат је већ у датотеци %s, па није поново додат."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6407,7 +6365,7 @@ msgstr ""
 "SSL грешка: %(error)s\n"
 "Да ли и даље желите да се повежете на овај сервер?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6418,63 +6376,63 @@ msgstr ""
 "SHA1 отисак овог сертификата:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Име налога је већ употребљено"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Већ имате налог са тим именом."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Активно"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "догађај"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Примљена Прва Порука"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Следећа Примљена Порука Фокусирана"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Следећа Примљена Порука Нефокусирана"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Контакт На Вези"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Контакт Отишао Са Везе"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Порука Послата"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Примљен Гмаил е-мејл"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6484,7 +6442,7 @@ msgstr ""
 "стигла на други крај. Ако ова икона остане овако \n"
 "дуго времена, вероватно је да се порука изгубила."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6492,225 +6450,222 @@ msgstr ""
 "Текст испод ове линије је оно што је речено од када сте последњи пут\n"
 "обратили пажњу на овај групни разговор"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Излаз"
+msgstr "_Цитат"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Акције за налог \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Прочитајте чланак на _Википедији"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Потражи у Речнику"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "УРЛ-у Речника недостаје \"%s\" и није Вики речник"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "УРЛ-у Веб претраге недостаје \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Претражи Веб"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Отвори као _Везу"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Јуче"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "Пре %i дана"
+msgid_plural "%i days ago"
+msgstr[0] "Јуче"
+msgstr[1] "Јуче"
+msgstr[2] "Јуче"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Џабер ID већ у листи контаката"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Џабер ID који сте унели је већ на листи. Одаберите неки други."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Џабер ИД: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "У групи"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "ИД Кључа"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Име контакта"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Постави расположење"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Статусна порука"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Статусна порука"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Препиши статусну поруку?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ово име се већ користи. Да ли желите да препишете ову статусну поруку?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Сними као већ постављену статусну поруку"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Молимо унесите име за ову статусну поруку"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "АИМ адреса:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "ГГ Број:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ Број:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN адреса:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! адреса:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати на налог %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Неисправан кориснички ИД"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "ИД корисника не сме садржавати ресурс."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Не можете додати себе у Вашу листу контаката."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Контакт је већ у листи"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Контакт је већ у листи контаката."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "ИД корисника:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "ГТК+ џабер клијент"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "ГТК+ верзија:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyГТК верзија:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Тренутни програмери:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Прошли програмери:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "ЗАХВАЛНИЦЕ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Последње, али не и најмање важно, желели бисмо захвалити свим одржаватељима "
 "пакета"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6723,98 +6678,100 @@ msgstr ""
 "\n"
 "Осветљавање лоше написаних речи неће бити у употреби"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Захтев претплате на рачун %(account)s од %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Захтев претплате од %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Већ сте у групном разговору %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Придружите се групном разговору преко налога %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Неисправно име налога"
+msgstr "Неисправан налог"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Налог са кога желите да уђете у собу"
+msgstr "Морате одабрати налог са кога желите да уђете у собу."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Неисправан Џабер ИД групног разговора"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Џабер ИД групног разговора има недозвољене знаке."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Ово није групни разговор"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s није име групног разговора."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Овај налог није повезан на сервер"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не можете се синхронизовати са налогом ако нисте повезани."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започни разговор са разуном %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Започни разговор"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6823,300 +6780,326 @@ msgstr ""
 "послати поруку:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Није могуће разложити \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Без везе није могућа промена лозинке."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Неисправна лозинка"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Морате да унесете лозинку"
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Контакт је на вези"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Нова Порука"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Нова Самостална Порука"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Нова Приватна Порука"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Нови Е-мејл"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Грешка при преносу датотеке"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Пренос датотеке завршен"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Позив на групни разговор"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Контакт променио статус"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Самостална порука користећи налог %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Самостална порука на налогу %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Самостална Порука"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Послате %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Примљене %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, 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:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Конзола за %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Конзола"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Тужан"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Измените"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Уклони"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Желио бих да Вас додам на листу мојих контаката."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> жели да <b>%s</b> неке контакте у листу ваших контаката."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
-msgstr ""
+msgstr "Додате"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Расположен"
+msgstr "Измените"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Џабер ИД:"
+msgstr "Џабер ИД"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Група"
+msgstr "Групе"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Желео бих да те додам на моју листу контаката."
+msgstr "%s је предложио да вас додам у листу мојих контаката."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Додај _контакт"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Уклања контакт са листе"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Листа приватности <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, 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:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Редослед: %(order)s, акција: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Измени правило</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додај правило</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Неисправно име листе"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Позвани сте у групни разговор"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Вас је позвао на разговор"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Вас је позвао на групни разговор у собу %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Да ли желите да прихватите ову позивницу?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Одаберите звук"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav Звукови"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Одаберите слику"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Слике"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Кад %s постане:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавање посебног обавештења за %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Услов"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "када сам "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7127,19 +7110,19 @@ msgstr ""
 "\n"
 "Кратка Аутентикациона Ниска ове сесије је: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Већ сте потврдили идентитет овог контакта."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Идентитет контакта потврђен"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Потврдите поново..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7149,19 +7132,19 @@ msgstr ""
 "поруке или да Вам шаљу поруке, морате потврдити њихов идентитет кликајући "
 "дугме испод."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Идентитет контакта НИЈЕ потврђен"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Потврди..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Да ли сте проверили идентитет контакта?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7175,22 +7158,22 @@ msgstr ""
 "да ли и он има исту кратку Аутентикациону ниску као ви.\n"
 "Кратка Аутентикациона Ниска ове сесије: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Да ли сте разговарали са контактом и потврдили КАН?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Кључ контакта (%s) <b>не поклапа се</b> са кључем придруженим у Гајиму."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ниједан GPG кључ није додељен контакту. Не можете му слати шифроване поруке."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7199,7 +7182,7 @@ msgstr ""
 "поруке <b>не могу</b> бити шифроване. Употребите Вашег GPG клијента да дате "
 "поверење овом кључу."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7207,6 +7190,25 @@ msgstr ""
 "GPG кључ је додељен овом контакту и Ви верујете овом кључу тако да ће поруке "
 "бити шифроване."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Остали"
@@ -7216,24 +7218,24 @@ msgstr "Остали"
 msgid "Conference"
 msgstr "Конференција"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Без успостављене везе, не можете разгледати доступне услуге"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откривање услуга са налога %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Откривање Услуга"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Услуга не може бити нађена"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7241,242 +7243,233 @@ msgstr ""
 "На наведеној адреси нема усуга, или нема одговора. Проверите адресу и "
 "покушајте поново."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Услуге нису претраживе"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Овај тип услуге не садржи елементе за претрагу"
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Неисправано име сервера"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Претражујем %(address)s користећи налог %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Преглед"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Ова услуга не садржи елементе за претрагу"
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Изврши наредбу"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Ре_гистрација"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Скенирање %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Корисници"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Опис"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Идентификација"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Маркер је већ постављен"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групни разговор \"%s\" је већ маркиран."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Маркер успешно додат"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
 "контаката."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Претплаћен"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Чвор"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Нова објава"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Претплати се"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Укини претплату"
 
-#: ../src/features_window.py:46
-#, fuzzy
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
-msgstr "Грешка SSL сертификата"
+msgstr "Валидација SSL сертификата"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Библиотека која се користи да провери сертификате сервера и осигура сигурну "
 "везу."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Захтева python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Разговор без сервера са аутодетекцијом клијената у локалној мрежи."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Захтева python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Захтева pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Команда: %s"
+msgstr "Командна линија"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипта за контролу Гајима из командне линије."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Захтева python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Могућност није доступна под Виндоуз системом."
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "Одабир OpenPGP Кључева"
+msgstr "Шифровање OpenPGP поруке"
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Шифрујем поруке разговора са gpg кључевима."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Захтева gpg и python-GnuPGInterface."
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
-msgstr "network-manager"
+msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Аутодетекција статуса мреже."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Захтева gnome-network-manager и python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Менаџмент сесија"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Гајим сесија је сачувана на прекиду везе и учитана по логовању."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Захтева python-gnome2."
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Лозинка за улазак у собу"
+msgstr "Шифровање лозинком"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Лозинке се могу сачувати и поузданије од обичног текста."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Захтева gnome-keyring and python-gnome2-desktop."
+msgstr "Захтева gnome-keyring and python-gnome2-desktop, или kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Даје могућност конекције на сервере који користе SRV записе."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Захтева dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Захтева nslookup да бисте користили SRV записе."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Провера правописа"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Провера правописа састављених порука."
 
-#: ../src/features_window.py:80
-#, fuzzy
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
-msgstr "Захтева python-sexy."
+msgstr "Захтева libgtkspell."
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
-msgstr "Обавештења"
+msgstr "Обавештење"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Пасивна искачућа обавештења о новим догађајима."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7484,54 +7477,33 @@ msgstr ""
 "Захтева python-notify или, уместо тога python-dbus у спрези са notification-"
 "daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Икона системске касете"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Икона у системској касети одражава тренутно стање."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Захтева python-gnome2-extras или компајлирање trayicon модула из Гајим "
-"изворног кода."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Захтева PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
-msgstr "_Подеси према статусу"
+msgstr "Аутоматски статус"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Даје могућност мерења времена када се ништа не дешава, да се одреди ауто "
 "статус."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
-msgstr ""
+msgstr "Захтева libxss библиотеку."
 
-#: ../src/features_window.py:93
-#, fuzzy
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
-msgstr "Захтева python-gnome2."
+msgstr "Захтева python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Претвара LaTeX изразе између $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7539,7 +7511,7 @@ msgstr ""
 "Захтева texlive-latex-base, и dvipng. Морате подесити'use_latex' на True у "
 "едитору напредних подешавања."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7547,25 +7519,23 @@ msgstr ""
 "Захтева texlive-latex-base и dvipng (све из MikTeX-а). Морате "
 "подесити'use_latex' на True у едитору напредних подешавања."
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "Енкрипција с краја на крај"
+msgstr "Шифровање поруке с краја на крај"
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Шифрујем поруке разговора."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Захтева python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "РСТ генератор"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7573,24 +7543,37 @@ msgstr ""
 "Генерише XHTML излаз од RST кода (погледати http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Захтева python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Банери и линкови на које се може кликнути"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Даје могућност да имате линкове на које се може кликнути у разговорима."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Захтева python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Захтева python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Могућност"
 
@@ -7606,139 +7589,138 @@ msgstr "Време"
 msgid "Progress"
 msgstr "Напредак"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Име датотеке: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Величина: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Ви"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Пошаљилац: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Примаоц: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сачувано у: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Пренос датотеке завршен"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Пренос датотеке прекинут"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Није могуће успоставити везу са другом страном."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Примаоц: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Порука грешке: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Одаберите датотеку за слање..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Опис:"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Гајим не може приступити овој датотеци"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Ову датотеку користи неки други процес."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Датотека: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Вам жели послати датотеку:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Није могуће преписати постојећу датотеку \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 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:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Ова датотека већ постоји"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "У фасциклу \"%s\" није могуће писање"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Немате привилегија за писање у овој фасцикли"
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7746,32 +7728,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Неисправна датотека"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Датотека: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Није могуће послати празну датотеку"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Пошаљилац: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Пауза"
 
@@ -7782,27 +7764,23 @@ msgstr "Гајиму треба X сервер да би се покренуо.
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "неуспело увожење PyGTK модула: %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Гајиму треба pyГТК 2.8 или већа верзија"
+msgstr "Гајиму треба pyGTK 2.12 или већа верзија"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Гајиму треба pyГТК 2.8 или већа верзија. Завршавам..."
+msgstr "Гајиму треба pyGTK 2.12 или већа верзија. Завршавам..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Гајиму треба pyГТК 2.8 или већа верзија"
+msgstr "Гајиму треба GTK 2.12 или већа верзија"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Гајиму треба pyГТК 2.8 или већа верзија. Завршавам..."
+msgstr "Гајиму треба GTK 2.12 или већа верзија. Завршавам..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7841,11 +7819,11 @@ msgstr ""
 "наћи на %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Гајим је већ покренут"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7853,463 +7831,28 @@ msgstr ""
 "Једна инстанца Гајима изгледа већ ради\n"
 "Свеједно желите покренути?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Лозинка неопходна"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Нема додељеног GPG кључа"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Повезаћете се на %s без OpenPGP кључа."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Неисправна лозинка"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Ваш жељени надимак је тренутно у употреби у групном разговору %s или је "
-"регистрован од стране неког од учесника.\n"
-"Молимо одредите други надимак испод:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Прихватате ли овај захтев?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Прихватате ли овај захтев на налогу %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) Ауторизација за %(url)s (ид: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Веза прекинута"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Грешка %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "грешка приликом слања %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Захтев за претплатом"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Ауторизација прихваћена"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Контакт \"%s\" је укинуо претплату на њега"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Увек ћете га/је видети као да није на вези.\n"
-"Да ли желите да га/је уклоните са листе контаката?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Укини претплату"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Контакт са \"%s\" се не може успоставити"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s је од сада познат као %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s је тренутно %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s је поставио тему на %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Соба сада приказује недоступне чланове"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "соба сада не приказује недоступне чланове"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"Десила се промена у конфигурацији собе (напомена: не утиче на приватност "
-"корисника)"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Логовање у соби је сада омогућено"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Логовање у соби је сада онемогућено"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Соба сада више није анонимна"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Соба је сада полу анонимна"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Соба је сада потпуно анонимна"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Конфигурисали сте Гајим да користи GPG агента, али не постоји GPG агент који "
-"ради или је вратио лошу фразу лозинке.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Тренутно сте повезани без OpenPGP кључа."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Ваша лозинка није тачна"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Ваша лозинка није тачна"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG није употребљив"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Ниједан GPG кључ није додељен контакту. Не можете му слати шифроване поруке."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Не питај ме више"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-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правилно подешене)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Нови е-мејл за %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Имате %d нови е-мејл разговор"
-msgstr[1] "Имате %d нова е-мејл разговора"
-msgstr[2] "Имате %d нових е-мејл разговора"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Од: %(from_address)s\n"
-"Тема: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s Вам жели послати датотеку."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Уклања контакт са листе"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Грешка при читању датотеке:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Успешно сте примили датотеку %(filename)s од контакта %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Не могу да дешифрујем поруку од контакта %s\n"
-"Можда је промењена."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Не могу да дешифрујем поруку"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Конфликт корисничког имена"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Пинг?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Понг! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Грешка."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Конфликт ресурса"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Већ сте конектовани на овај налог са истим ресурсем. Молимо Вас, откуцајте "
-"ново име ресурса"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Грешка при верификацији SSL сертификата"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Дошло је до грешке приликом верификовања SSL сертификата Вашег џабер сервера:"
-"%(error)s\n"
-"Да ли и даље желите да се конектујете на овај сервер?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Игнориши ову грешку за овај сертификат."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Грешка SSL сертификата"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Чини се да се SSL сертификат променио или је Ваша конекција нападнута.\n"
-"Стари отисак: %(old)s\n"
-"Нови отисак: %(new)s\n"
-"\n"
-"Да ли и даље желите да се конектујете и освежите отисак овог сертификата?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Несигурна веза"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Управо ћете послати лозинку преко нешифроване везе. Јесте ли сигурни да "
-"желите то да урадите?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Да, заиста желим да се конектујем несигурном везом"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
-"PyOpenSSL да спречите ово. Да ли желите да наставите?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "PEP чвор није уклоњен"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Смајлији искључени"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Ваша тема за смајлије не може да се учита. Можда треба да унапредите формат "
-"emoticons.py датотеке. Погледајте http://trac.gajim.org/wiki/Emoticons за "
-"више детаља."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Немогуће је приступити групном разговору ако сте невидљиви"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Није могуће чување Ваших подешавања"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Приказује помоћ за одређену наредбу"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "наредба"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "прикажи помоћ за команду"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Приказује или скрива прозор листе контаката "
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Искаче прозор са следећим догађајем на чекању"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8317,51 +7860,51 @@ msgstr ""
 "Исписује листу свих контаката са листе контаката. Сваки контакт је у "
 "посебној линији"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "налог"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "приказује само контакте са овог налога"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Исписује листу регистрованих налога"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Мења статус једног или више налога"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "статус"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
 "узнемиравај, невидљив"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "порука"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "статусна порука"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8370,48 +7913,43 @@ msgstr ""
 "свих налога који имају укључену опцију \"синхронизација са глобалним статусом"
 "\""
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
 msgstr "Мења статус једног или више налога"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Приори_тет"
+msgstr "приоритет"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Желим да региструјем нови налог"
+msgstr "приоритет који желите да дате овом налогу"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"измена статуса налога \"налог\". Ако није одређен, покушај промене статуса "
-"свих налога који имају укључену опцију \"синхронизација са глобалним статусом"
-"\""
+"измена приоритета датог налога. Ако није одређен, мења се статус свих налога "
+"који имају постављену опцију \"синхронизација са глобалним статусом\""
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Приказује дијалог разговора како бисте могли разговарати са контактом"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Џабер ИД контакта са којим желите разговарати"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако је назначено, контакт се узима са листе контаката овог налога"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "садржај поруке. Налог мора бити назначен или \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8421,29 +7959,29 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Џабер ИД контакта који ће примити поруку"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "садржај поруке"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp кључ"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ако је назначено, порука ће бити шифрована користећи овај јавни кључ"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "ако је назначено, порука ће бити послата користећи овај налог"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8453,135 +7991,135 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тема поруке"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Шаље нову поруку на групни разговор коме сте се придружили."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "Џабер ИД собе која ће примити поруку"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Даје детаљне информације о контакту"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Џабер ИД контакта"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Даје детаљне информације о налогу"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Име налога"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Шаље датотеку контакту"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "датотека"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Путања до датотеке"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "ако је назначено, датотека ће бити послата коритећи овај налог"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Приказује сва подешавања и њихове вредности"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Поставља вредност 'кључа' на 'вредност'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "кључ=вредност"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'кључ' је име ставке подешавања, 'вредност' је вредност на коју ће се ставка "
 "поставити"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Брише ставку подешавања"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "кључ"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "име ставке подешавања које ће се брисати"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записује тренутно стање Гајим подешавања у .config датотеку"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Уклања контакт са листе"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Додаје контакт на листу"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "џид"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Додаје нови контакт овом рачуну"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Враћа тренутни статус (глобални ако није назначен налог)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Враћа број непрочитаних порука"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отвара дијалог за започињање разговора"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Започиње разговор, користећи овај налог"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Шаље кориснички дефинисан XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML за слање"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8589,72 +8127,71 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Управља xmpp:/ uri-јем"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI за управљање"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Налог у коме желите да управљате њиме"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "садржај поруке"
+msgstr "Садржај поруке"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Придружи се новој соби"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "соба"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "Џабер ID собе:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "надимак"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Надимак за коришћење"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "лозинка"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Лозинка за улазак у собу"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Налог са кога желите да уђете у собу"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Молимо проверите да ли је Гајим покренут"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Приказује или скрива ipython прозор"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Недостаје аргумент \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8663,15 +8200,15 @@ msgstr ""
 "'%s' није на Вашј листи.\n"
 "Молимо одредите налог за слање поруке."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "немате активних рачуна"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8680,16 +8217,16 @@ msgstr ""
 "Коришћење: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s није пронађен"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8698,7 +8235,7 @@ msgstr ""
 "Коришћење: %s наредба [аргументи]\n"
 "Наредба је једна од:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8707,7 +8244,7 @@ msgstr ""
 "Превише аргумената\n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8716,7 +8253,7 @@ msgstr ""
 "Аргумент \"%(arg)s\" није наведен. \n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Лош uri"
 
@@ -8745,151 +8282,175 @@ msgstr "Не можете избрисати Вашу тренутну тему"
 msgid "Please first choose another for your current theme."
 msgstr "Молимо Вас да прво одаберете неку другу тему."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Више нисте у групном разговору \"%(room)s\" или је \"%(nick)s\" отишао."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Разговор са "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Настављени разговор"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Логовање собе је омогућено"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Нова соба је направљена"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер Вам је или доделио надимак или променио постојећи"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, 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:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s има забрану: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s има забрану од члана %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s је од сада познат као %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "везаност измењена"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "конфигурација собе се променила на \"само чланови\""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "гашење система"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, 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:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Афилијација %(nick)s је постављена на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, 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:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s је отишао"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s је тренутно %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Не питај ме више"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Промена Теме"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Молимо одредите нову тему:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Промена надимка"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Молимо одредите нови надимак који желите да користите:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Уништавам %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8897,22 +8458,22 @@ msgstr ""
 "Управо ћете заувек уништити ову собу.\n"
 "Можете испод написати разлог:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Можете такође унети и алтернативну локацију:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Избацујем %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Можете навести разлог испод:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Забрањујем %s"
@@ -8936,59 +8497,473 @@ msgid "Details"
 msgstr "Детаљи"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: није могуће отворити %s за читање"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Грешка при читању датотеке:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Грешка при учитавању датотеке"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Није могуће писати у %s. Управљање сесијама неће бити могуће"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Гајим није Ваш подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Желите ли да Вам Гајим постане подразумевани Гајим клијент?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Увек на стартовању проверавај да ли је Гајим подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Екстензија није подржана"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Слику није могуће сачувати у %(type)s формату. Сачувати као %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Сними слику као..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ваш жељени надимак је тренутно у употреби у групном разговору %s или је "
+"регистрован од стране неког од учесника.\n"
+"Молимо одредите други надимак испод:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Увек користи надимак када постоји конфликт"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Прихватате ли овај захтев?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Прихватате ли овај захтев на налогу %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) Ауторизација за %(url)s (ид: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Веза прекинута"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Грешка %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "грешка приликом слања %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Захтев за претплатом"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Ауторизација прихваћена"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Контакт \"%s\" је укинуо претплату на њега"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Увек ћете га/је видети као да није на вези.\n"
+"Да ли желите да га/је уклоните са листе контаката?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Укинута претплата"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Контакт са \"%s\" се не може успоставити"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s је поставио тему на %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Соба сада приказује недоступне чланове"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "соба сада не приказује недоступне чланове"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Десила се промена у конфигурацији собе (напомена: не утиче на приватност "
+"корисника)"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Логовање у соби је сада омогућено"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Логовање у соби је сада онемогућено"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Соба сада више није анонимна"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Соба је сада полу анонимна"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Соба је сада потпуно анонимна"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Конфигурисали сте Гајим да користи GPG агента, али не постоји GPG агент који "
+"ради или је вратио лошу фразу лозинке.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Тренутно сте повезани без OpenPGP кључа."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Ваша лозинка није тачна"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "OpenGPG лозинка није тачна"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG кључ није од поверења"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"GPG кључ који се користи за шифровање није од поверења. Да ли заиста желите "
+"да шифрујете ову поруку?"
+
+#: ../src/gui_interface.py:1182
+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правилно подешене)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Нови е-мејл за %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Имате %d нови е-мејл разговор"
+msgstr[1] "Имате %d нова е-мејл разговора"
+msgstr[2] "Имате %d нових е-мејл разговора"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Од: %(from_address)s\n"
+"Тема: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s Вам жели послати датотеку."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Удаљени контакт је прекинуо пренос"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Грешка при отварању датотеке"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Успешно сте примили датотеку %(filename)s од контакта %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Не могу да дешифрујем поруку од контакта %s\n"
+"Можда је промењена."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Не могу да дешифрујем поруку"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Конфликт корисничког имена"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Пинг?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Понг! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Грешка."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Конфликт ресурса"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Већ сте конектовани на овај налог са истим ресурсем. Молимо Вас, откуцајте "
+"ново име ресурса"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s Вам жели послати датотеку."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Захтев за преносом датотеке"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Грешка при верификацији SSL сертификата"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Дошло је до грешке приликом верификовања SSL сертификата Вашег џабер сервера:"
+"%(error)s\n"
+"Да ли и даље желите да се конектујете на овај сервер?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Игнориши ову грешку за овај сертификат."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Грешка SSL сертификата"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Чини се да се SSL сертификат налога %(account)s променио или је Ваша "
+"конекција нападнута.\n"
+"Стари отисак: %(old)s\n"
+"Нови отисак: %(new)s\n"
+"\n"
+"Да ли и даље желите да се конектујете и освежите отисак овог сертификата?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Несигурна веза"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Управо ћете послати лозинку преко нешифроване везе. Јесте ли сигурни да "
+"желите то да урадите?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Да, заиста желим да се конектујем несигурном везом"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
+"PyOpenSSL да спречите ово. Да ли желите да наставите?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP чвор није уклоњен"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Смајлији искључени"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Ваша тема за смајлије не може да се учита. Можда треба да унапредите формат "
+"emoticons.py датотеке. Погледајте http://trac.gajim.org/wiki/Emoticons за "
+"више детаља."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+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/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Није могуће чување Ваших подешавања"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Лозинка неопходна"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "GPG кључ истекао"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Ваш GPG кључ је истекао, бићете повезани са %s без OpenPGP-а."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Неисправна лозинка"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Нови групни разговор"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Желео бих Вас додати на моју листу контаката"
 
@@ -9003,7 +8978,7 @@ msgstr "Контакти"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Датум"
 
@@ -9014,7 +8989,7 @@ msgstr "Надимак"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Порука"
 
@@ -9039,195 +9014,192 @@ msgstr ""
 "\n"
 "Уколико притисните Да, молимо сачекајте..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Извожење дневника историјата..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s у %(time)s каже: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Да ли заиста желите избрисати дневник разговора означеног контакта?"
 msgstr[1] ""
 "Да ли заиста желите избрисати дневнике разговора означених контаката?"
 msgstr[2] ""
+"Да ли заиста желите избрисати дневнике разговора означених контаката?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Ова операција је неповратна."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Да ли заиста желите да избришете означену поруку?"
 msgstr[1] "Да ли заиста желите да избришете означене поруке?"
-msgstr[2] ""
+msgstr[2] "Да ли заиста желите да избришете означене поруке?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Историјат разговора са %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Грешка при упису на диск"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s је тренутно %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Порука грешке: %s"
+msgstr "Грешка: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Грешка."
+msgstr "Грешка"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус је тренутно: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус је тренутно: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Истекло време за учитавање слике"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Слика је превелика"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Нисте повезани на сервер"
+msgstr "Затворићете неколико језичака"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Да ли заиста желите да избришете означену поруку?"
+msgstr "Да ли заиста желите да их све затворите?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Групни разговори"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Приватни Разговори"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Поруке"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- поруке ће бити логоване"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- поруке неће бити логоване"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s је променио статус"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s је на вези"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s је отишао"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нова самостална порука од контакта %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нова приватна порука са групног разговора %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:568
 msgid "Ignore"
-msgstr "_Игнориши"
+msgstr "Игнориши"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Дохватање профила..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Датотека је празна"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Датотека не постоји"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Информације примљене"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Ако нисте на вези, не можете објавити Баше информације"
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Слање профила..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Информације НИСУ објављене"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Публикација vCard неуспела"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9235,46 +9207,51 @@ msgstr ""
 "Настала је грешка приликом објављивања Ваших личних информација, покушајте "
 "поново касније."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Ауторизација послата"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Ауторизација уклоњена"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG није употребљив"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Повезаћете се на %s без OpenPGP кључа."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Учествујете у једном или више групних разговора"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9282,28 +9259,27 @@ msgstr ""
 "Промена Вашег статуса у Невидљив ће резултовати  одвезивањем са тих групних "
 "разговора. Јесте ли сигурни да желите ићи на невидљиво?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "десинхронизован"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Стварно затворити Гајим?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
+msgstr "Јесте ли сигурни да желите затворити Гајим?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Увек затвори Гајим"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Имате непрочитаних порука"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9311,16 +9287,16 @@ msgstr ""
 "Поруке ће бити доступне за читање и касније ако имате омогућен историјат и "
 "тај контакт у листи."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Морате их прочитати пре уклањања овог транспорта."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" ће бити уклоњен"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9328,11 +9304,11 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Транспорт ће бити уклоњен"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9341,69 +9317,70 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са ових "
 "транспорта: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
-"Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
+"Управо ћете блокирати контакт. Јесте ли сигурни да желите да наставите?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Контакт ће вас видети као да нисте на вези и нећете добијати поруке које вам "
+"шаље."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Преименуј контакт"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Преименуј групу"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Унесите ново име за групу %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Уклони групу"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Желите ли уклонити групу %s са листе контаката?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Уједно уклоња и све контакте из ове групе из листе контаката"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Придружи OpenPGP Кључ"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Одаберите кључ за придруживање контакту"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" ће бити уклоњен са Ваше листе контаката"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, 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:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9412,11 +9389,11 @@ msgstr ""
 "особа увек видети као да нисте на вези."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Да ли желите да наставите?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9424,16 +9401,16 @@ msgstr ""
 "Уклањањем овог контакта уједно подразумевано уклањате и одобрење што значи "
 "да ће Вас та особа увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти ће бити уклоњени са Ваше листе контаката"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9443,35 +9420,37 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
+"Управо ћете послати прилагођен статус. Јесте ли сигурни да желите да "
+"наставите?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Контакт ће вас привремено видети као %(status)s, али само док не промените "
+"статус. Онда ће видети глобални статус."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9479,13 +9458,13 @@ msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9495,11 +9474,11 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9507,172 +9486,171 @@ msgstr[0] "Да ли желите послати ову датотеку кон�
 msgstr[1] "Да ли желите послати ове датотеке контакту %s:"
 msgstr[2] "Да ли желите послати ове датотеке контакту %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Послате %s"
+msgstr "Пошаљи %s за %s"
 
-#: ../src/roster_window.py:4213
-#, fuzzy, python-format
+#: ../src/roster_window.py:4233
+#, python-format
 msgid "Make %s and %s metacontacts"
-msgstr "Шаље датотеку контакту"
+msgstr "Направи метаконтакте од %s и %s"
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "користећи рачун %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "на %s налог"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "користећи %s рачун"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "Управљање _маркерима..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "налога %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "за налог %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Конфигуриши сервисе..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Измени _групе"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Пошаљи једну поруку"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Изврши наредбу..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Управљање транспортима"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Преименуј"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Излогуј се"
+msgstr "У_логуј се поново"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Излогуј се"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Придруживање новом групном разговору"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Промени статусну поруку..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Чекам на резултате"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Грешка у примању форме за податке"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Нема резултата"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Грешка при упису на диск"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Потврди ове опције сесије"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9687,7 +9665,7 @@ msgstr ""
 "\n"
 "\tДа ли су ове ставке прихватљиве?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9702,116 +9680,116 @@ msgstr ""
 "\n"
 "Наставити са сесијом?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Промени статусну поруку..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Сакриј овај мени"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Џабер ИД: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s овог групног разговора"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [умањен]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Статус: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Последњи статус: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " од %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "На вези"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Ван везе"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Претплата: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Песма:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Скидање"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Слање"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Пренешено: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Није почео"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Заустављен"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Завршен"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?статус преноса:Паузиран"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Застој"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Пренос у току"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Овај сервис још није пружио детаљне информације"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9819,29 +9797,28 @@ msgstr ""
 "Овај сервис није могао одговорити са детаљним информацијама.\n"
 "Највероватније је застарео или у квару"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Клијент:Непознат"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?ОС:Непознат"
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
-msgstr "?Клијент:Непознат"
+msgstr "?Време:Непознато"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "од %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Везаност:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9849,7 +9826,7 @@ msgstr ""
 "Овај контакт је заинтересован за информације о Вашем присуству, али Вас не "
 "занимају информације о његовом/њеном присуству."
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9857,13 +9834,13 @@ msgstr ""
 "Ви сте заинтересовани за информације о присуству неког контакта, али њега/њу "
 "не занима Ваше присуство"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9871,18 +9848,72 @@ msgstr ""
 "Не интересује Вас присутност контакта, нити Ваша присутност интересује њега/"
 "њу"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чекате одговор контакта о Вашем захтеву за претплатом"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Нема захтева за претплатом на чекању."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Долазна порука:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Одлазна порука:"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Хост %s који сте поставили као ft_add_host_to_send напредно подешавање "
+#~ "није исправан. па је игнорисан."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Лозинка за OpenPGP није унета"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Ако желите наставити са слањем и примањем порука, морате се искључити и "
+#~ "поново доћи на везу."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Нисте спојени или сте невидљиви за друге. Ваша порука не може бити "
+#~ "послата."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Ова порука је шифрована]"
+
+#~ msgid "%i days ago"
+#~ msgstr "Пре %i дана"
+
+#~ msgid "Trayicon"
+#~ msgstr "Икона системске касете"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Икона у системској касети одражава тренутно стање."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Захтева python-gnome2-extras или компајлирање trayicon модула из Гајим "
+#~ "изворног кода."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Захтева PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Додај посеб_но обавештење"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 0ffb9d1c2..77d681383 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-20 00:05+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-10-29 23:50+0100\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -96,7 +96,7 @@ msgstr "<b>Molimo odaberite server</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -107,9 +107,8 @@ msgstr ""
 "SHA1 potpis sertifikata:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Koristi autentikaciju"
+msgstr "Anon_imno prijavljivanje"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -283,9 +282,9 @@ msgstr "Izmeni lične informacije"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -294,9 +293,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Opšte"
 
@@ -356,21 +355,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Nije odabran nijedan ključ"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Ništa"
 
@@ -475,18 +474,16 @@ msgid "<b>Proxy</b>"
 msgstr "<b>Proksi</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
-msgstr "_Podesi prema statusu"
+msgstr "Po_desi prema statusu"
 
 #: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Nalozi"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Koristi autentikaciju"
+msgstr "Anonimno prijavljivanje"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -497,7 +494,6 @@ msgstr ""
 "nesigurne veze."
 
 #: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
 msgstr "Po_veži se prilikom pokretanja Gajima"
 
@@ -526,8 +522,8 @@ msgstr ""
 "Mogli biste uzeti u obzir i mogućnost izmene podešavanja firewall-a."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Džaber ID:"
 
@@ -541,57 +537,47 @@ msgid "Mer_ge accounts"
 msgstr "_Spoji naloge"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Prei_menuj"
 
 #: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
 msgid "Send _keep-alive packets"
-msgstr "Šalji podatke o živosti"
+msgstr "Šalji podat_ke o živosti"
 
 #: ../data/glade/accounts_window.glade.h:49
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
-msgstr "Sinhroniziraj status naloga sa globalnim statusom"
+msgstr "Sinhroni_zuj status naloga sa globalnim statusom"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use G_PG Agent"
-msgstr "Koristi GPG agenta"
+msgstr "Koristi G_PG agenta"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om hostname/port"
-msgstr "Koristi Vaše određeno ime hosta/port "
+msgstr "K_oristi Vaše određeno ime hosta/port "
 
 #: ../data/glade/accounts_window.glade.h:53
-#, fuzzy
 msgid "Use cust_om port:"
-msgstr "Koristi svoj port:"
+msgstr "K_oristi svoj port:"
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Edit Personal Information..."
-msgstr "Izmeni lične informacije"
+msgstr "Izm_eni lične informacije..."
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Enable"
-msgstr "Omogući"
+msgstr "_Omogući"
 
 #: ../data/glade/accounts_window.glade.h:57
-#, fuzzy
 msgid "_Hostname: "
-msgstr "Ime hosta:"
+msgstr "Ime _hosta:"
 
 #: ../data/glade/accounts_window.glade.h:59
-#, fuzzy
 msgid "_Manage..."
-msgstr "Podesi..."
+msgstr "_Podesi..."
 
 #: ../data/glade/accounts_window.glade.h:61
-#, fuzzy
 msgid "_Port: "
 msgstr "_Port:"
 
@@ -600,9 +586,8 @@ msgid "_Warn before using an insecure connection"
 msgstr "Upozori pre korišćenja nesigurne veze"
 
 #: ../data/glade/accounts_window.glade.h:63
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
-msgstr "koristi HTTP_PROXY promenljivu okruženja"
+msgstr "koristi HTTP_PROXY promenljiv_u okruženja"
 
 #: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
@@ -949,7 +934,7 @@ msgstr "Zadnji put izmenjeno:"
 msgid "New entry received"
 msgstr "Nov događaj primljen"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Primili ste novi unos:"
 
@@ -993,11 +978,11 @@ msgstr "Unesite novu lozinku:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Upišite Vašu novu statusnu poruku</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Aktivnost:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Raspoloženje:"
 
@@ -1077,9 +1062,8 @@ msgid "Assign Open_PGP Key..."
 msgstr "Pridruži Open_PGP Ključ..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
-msgstr "Izvrši naredbu..."
+msgstr "I_zvrši naredbu..."
 
 #: ../data/glade/contact_context_menu.glade.h:5
 msgid "Edit _Groups..."
@@ -1087,8 +1071,8 @@ msgstr "Izmeni _grupe..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
@@ -1101,8 +1085,8 @@ msgid "Remo_ve"
 msgstr "_Ukloni"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Pošalji korisnički definisan status"
 
@@ -1135,8 +1119,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli mu/joj da vidi moj status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Blokiraj"
 
@@ -1147,7 +1131,7 @@ msgstr "_Zabrani mu/joj da vidi moj status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Istorijat"
 
@@ -1168,8 +1152,8 @@ msgid "_Subscription"
 msgstr "_Pretplata"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
@@ -1257,7 +1241,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Nastavi"
 
@@ -1265,7 +1249,7 @@ msgstr "_Nastavi"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Obavesti me kada se završi prenos datoteke"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "_Otvori sadržavajuću fasciklu"
 
@@ -1293,7 +1277,7 @@ msgstr ""
 "Red kontakata\n"
 "Baner razgovora"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Podebljano"
 
@@ -1313,11 +1297,11 @@ msgstr "Personalizacija Gajim tema"
 msgid "Gone"
 msgstr "Otišao"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Kurziv"
 
@@ -1365,7 +1349,7 @@ msgstr "Promeni _temu..."
 msgid "Configure _Room..."
 msgstr "Podesi _sobu..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Markiraj ovu so_bu"
 
@@ -1445,7 +1429,7 @@ msgid ""
 "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>UPOZORENjE:</b>\n"
+"<b>UPOZORENJE:</b>\n"
 "Ako planirate da radite veća uklanjanja, potrudite se da Gajim nije "
 "pokrenut. Uopšte, izbegavakte uklanjanja kontakata sa kojima trenutno "
 "razgovorate."
@@ -1454,8 +1438,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Dobrodošli u Gajimov menadžer dnevnika istorijata</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Obriši"
 
@@ -1485,7 +1470,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Pretraži bazu podataka"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Istorijat razgovora"
 
@@ -1509,11 +1494,10 @@ msgid "_Log conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "_Markiraj ovu sobu (Ctrl+B)"
+msgstr "Markiraj ovu sobu"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
@@ -1540,8 +1524,8 @@ msgstr "Nedavno:"
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Pridruži se"
 
@@ -1570,7 +1554,7 @@ msgstr "Umanji prozor na auto povezivanje"
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1599,14 +1583,14 @@ msgid "<b>Settings</b>"
 msgstr "<b>Podešavanja</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
 "BOSH"
 msgstr ""
 "HTTP spoj\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
@@ -1617,32 +1601,28 @@ msgid "Pass_word:"
 msgstr "Lozinka:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-#, fuzzy
 msgid "Proxy _Host:"
-msgstr "Proksi:"
+msgstr "Proksi _host:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-#, fuzzy
 msgid "Proxy _Port:"
-msgstr "_Port:"
+msgstr "Proksi _port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
-msgstr ""
+msgstr "Kor_isti HTTP proksi"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
-msgstr "Koristi autentikaciju"
+msgstr "Koristi proksi prijavljivanje"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
-msgstr ""
+msgstr "_BOSH adresa:"
 
 #: ../data/glade/manage_proxies_window.glade.h:14
-#, fuzzy
 msgid "_Type:"
-msgstr "Vrsta:"
+msgstr "Vrs_ta:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
@@ -1681,22 +1661,30 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Prikaži listu smajlija (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
-#, fuzzy
 msgid "Show a list of formattings"
-msgstr "Prikaži listu smajlija (Alt+M)"
+msgstr "Prikaži listu formatiranja"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Prikaži meni naprednih funkcija (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Prikaži profil kontakta (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Pošalji"
 
@@ -1795,7 +1783,7 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:26
 msgid "Allow sound when I'm _busy"
-msgstr ""
+msgstr "Doz_voli zvukove kada sam zauzet"
 
 #: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
@@ -1828,6 +1816,16 @@ msgid "Configure color and font of the interface"
 msgstr "Konfigurisanje boje i fonta interfejsa"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Poruka razgovora:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Ime kontakta"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1841,31 +1839,31 @@ msgstr ""
 "Otkačena lista kontakata sa razgovorima grupisanom po nalozima\n"
 "Otkačena lista kontakata sa razgovorima grupisanom po tipu"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Prikaži aktivnosti kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Prikaži dodatne e-mejl detalje"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Prikaži _pesme kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Prikaži _avatare kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Prikaži _raspoloženja kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne poruke kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1875,7 +1873,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se prikazivati u "
 "prozorima razgovora."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1885,7 +1883,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se slati drugoj "
 "osobi."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1893,11 +1891,11 @@ msgstr ""
 "Gajim će Vas obavestiti o kontaktima koji su se upravo odjavili sa iskačućim "
 "prozorom u donjem desnom uglu ekrana"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Sakrij svu dugmad u prozoru razgovora"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1905,7 +1903,7 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1913,14 +1911,14 @@ msgstr ""
 "Ako je označena, Gajim će ujedno uključiti i informacije o pošiljaocu novih "
 "e-mejlova"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ako je označena, Gajim će automatski promeniti status u Odsutan kada računar "
 "nije u upotrebi."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1928,7 +1926,7 @@ msgstr ""
 "Ako je označena, Gajim će promeniti status u Nedostupan kada računar još "
 "duže nije u upotrebi"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1936,7 +1934,7 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1944,26 +1942,26 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ako je označena, Gajim će prikazivati aktivnosti kontakata u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
 "kontakata"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ako je označena, Gajim će prikazivati pesme kontakata u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1974,7 +1972,7 @@ msgstr ""
 "polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
 "grupni razgovor."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1983,7 +1981,7 @@ msgstr ""
 "Ako je označena, Gajim će ignorisati sve dolazne događajeKoristite sa "
 "oprezom, blokiraće sve poruke koje dolaze od ljudi van Vaše liste kontakata"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1993,7 +1991,7 @@ msgstr ""
 "kada se koristi E2E enkripcija, druga strana mora da se složi sa čuvanjem "
 "dnevnika, u suprotnom se poruke neće pamtiti."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2001,7 +1999,7 @@ msgstr ""
 "Ako je označena, Gajim će prikazati poruku kada se primi novi e-mejl preko "
 "GMail-amejlova"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2010,7 +2008,7 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
 "(npr. kontakt sa MSN-a će imati msn ikone za svoje statuse)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2018,7 +2016,7 @@ msgstr ""
 "Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
 "podrazumevana poruka će biti korišćena."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2026,50 +2024,53 @@ msgstr ""
 "Ako nije onemogućeno, Gajim će zameniti ascii smajlije kao npr. ':)' sa "
 "ekvivalentnim animiranim ili statičnim grafičkim smajlijima"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Upisuj u dnevnik šifrovane sesije razgovora"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "Načini prozor poruke kompaktnim"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Pode_si..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Nikad\n"
+"Samo za događaje na čekanju\n"
+"Uvek"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Obaveštenja"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavesti me o kontaktima koji se _prijave"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavesti me o kontaktima koji se _odjave"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Lični događaji"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Puštaj zvukove"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2079,24 +2080,23 @@ msgstr ""
 "Obavesti me o tome\n"
 "Prikaži samo u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
-msgstr "Prikaži događaj u sistemskoj kaseti"
+msgstr "Prikaži u sistemskoj kaseti:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Prijavljivanju"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Odjavljivanju"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2104,145 +2104,149 @@ msgstr ""
 "Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.). Ako "
 "je označeno, Gajim će samo prikazivati sirovi tekst poruke."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Sortiraj kontakte po statusu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Skup statusnih ikona:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:95
 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 ""
-"Auto statusna poruka pri odsutnosti. Ako je prazno, Gajim neće izmeniti "
-"trenutnu statusnu poruku"
+"Automatska statusna poruka pri odsutnosti. Ako je prazno, Gajim neće "
+"izmeniti trenutnu statusnu poruku\n"
+"$S će biti zamenjeno prethodnom statusnom porukom\n"
+"$T će biti zamenjeno sa vremenom odsutnosti"
 
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:98
 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 ""
-"Auto statusna poruka pri nedostupnosti. Ako je prazno, Gajim neće izmeniti "
-"trenutnu statusnu poruku"
+"Automatska statusna poruka pri nedostupnosti. Ako je prazno, Gajim neće "
+"izmeniti trenutnu statusnu poruku\n"
+"$S će biti zamenjeno prethodnom statusnom porukom\n"
+"$T će biti zamenjeno sa vremenom nedostupnosti"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Koristi ikone za _transporte"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Koristi sistemski podrazumevano"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Kada se primi novi događaj:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Poruka greške: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Nadimak:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "Autom_atski odsutan posle:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Internet pregledač:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "_Prikazana obaveštenja o stanju razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Smajliji:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Pregledač datoteka:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Oboji pogrešno napisane reči"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoriši bogato formatirani sadržaj u pristiglim porukama"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Dolazna poruka:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_E-mejl klijent:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "Automatski _nedostupan nakon:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Odlazna poruka:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Ponovo učitaj podrazumevane boje"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "Pošalji obaveštenja o stanju razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "URL osvetljavanje:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "Ponašanje prozora:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "u _listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minuta"
 
@@ -2275,9 +2279,8 @@ msgid "All"
 msgstr "Svi"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "sve prema pretplati"
+msgstr "Sve (uključujući i pretplate)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2295,7 +2298,7 @@ msgstr "Džaber ID"
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Lista privatnosti"
 
@@ -2439,7 +2442,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Uloga:</b>"
 
@@ -2499,8 +2502,8 @@ msgstr "Ukloni nalog i iz Gajima i sa servera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -2509,24 +2512,25 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>neko@domaćin.com</b> želi da <b>dodate</b> neke kontakte u listu "
+"kontakata."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "Telo poruke <trenutno se ne koristi, pa je podrazumevano sakriveno>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Razmena stavki kontakata"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_U redu"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-close"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2553,9 +2557,8 @@ msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
-msgstr "Prikaži kontakte koji nisu na vezi"
+msgstr "Prikaži samo _aktivne kontakte"
 
 #: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
@@ -2584,7 +2587,7 @@ msgstr "_Akcije"
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Izmeni"
 
@@ -2625,11 +2628,11 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "Informacije"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Pretraga"
 
@@ -2649,10 +2652,6 @@ msgstr "Registruj se na"
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_U redu"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "O"
@@ -2757,9 +2756,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Klijent:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
-msgstr "<b>Pokrajina:</b>"
+msgstr "<b>Vreme kontakta na vezi:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
@@ -2858,284 +2856,267 @@ msgstr "Resurs:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Poništi odobravanje"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Trenutno izvršavate komandu. Da li želite da je prekinete?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Servis je poslao loše podatke"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Servis je izmenio identifikator sesije."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Servis je vratio grešku."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktivirano"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Deaktivirano"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Da/Ne"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Ceo broj"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Ime postavke"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Vrednost"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Tip"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(ništa)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Skriven"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Primili ste novi unos:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Primili ste nove unose (%(count)d nije prikazano):"
+msgstr[1] "Primili ste nove unose (%(count)d nije prikazano):"
+msgstr[2] "Primili ste nove unose (%(count)d nije prikazano):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Engleski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Beloruski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Bretanski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Nemački"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Britanski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Španski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italijanski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Holandski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brazilski portugalski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Švedski"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Jezik za pravopis"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslata ako niste povezani."
 
-#: ../src/chat_control.py:820
-#, fuzzy
+#: ../src/chat_control.py:861
 msgid "Underline"
-msgstr "Nedefinisan"
+msgstr "Podvučeno"
 
-#: ../src/chat_control.py:821
-#, fuzzy
+#: ../src/chat_control.py:862
 msgid "Strike"
-msgstr "Bolestan"
+msgstr "Precrtano"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
-msgstr ""
+msgstr "Font"
 
-#: ../src/chat_control.py:853
-#, fuzzy
+#: ../src/chat_control.py:894
 msgid "Clear formating"
-msgstr "Informacije kontakta"
+msgstr "Očisti formatiranje"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Stvarno pošalji datoteku?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Ako pošaljete datoteku kontaktu %s, on/ona će znati Vaš pravi džaber ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Nije na listi kontakata"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "Lista prenosa aktivnih, završenih i zaustavljenih datoteka"
+msgstr "Ovak kontakt ne podržava prenos datoteka."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
+"Morate znati pravi džaber ID kontakta da biste mu/joj poslali datoteku."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Nepoznat izvođač"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Nepoznat naslov"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Nepoznat izvor"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
-"iz <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Nema dodeljenog GPG ključa"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3143,50 +3124,50 @@ msgstr ""
 "Nijedan GPG ključ nije dodaljen ovom kontaktu. Ne možete šifrovati poruke sa "
 "GPG-om."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti pamćena"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti pamćena"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
-msgstr "i autentifikovani"
+msgstr "i prijavljeni"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
-msgstr "i NEautentifikovani"
+msgstr "i NEprijavljeni"
 
 #. 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:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3195,48 +3176,48 @@ msgstr ""
 "%(type)s šifrovanje %(status)s aktivan %(authenticated)s.\n"
 "Vaša sesija razgovora %(logged)s biti pamćena."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Uspostavljanje sesije prekinuto"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Ova sesija je šifrovana"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr "i BIĆE pamćena"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti pamćena"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Identitet drugog korisnika nije potvrđen. Kliknite na štit za više detalja."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Sledeća poruka NIJE bila šifrovana"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Sledeća poruka je bila šifrovana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3244,15 +3225,15 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3261,7 +3242,7 @@ msgstr ""
 "Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite ili "
 "uklonite (sav istorijat poruka će biti izgubljen)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je sada %(status)s"
@@ -3270,23 +3251,23 @@ msgstr "%(name)s je sada %(status)s"
 msgid "creating logs database"
 msgstr "kreiram bazu dnevnika"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je datoteka, ali bi trebala biti fascikla"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim će se sada završiti"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je fascikla, ali bi trebala biti datoteka"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram fasciklu %s"
@@ -3349,10 +3330,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Odaberite grupne razgovore koje želite da napustite"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Grupni razgovori"
 
@@ -3370,7 +3351,7 @@ msgstr "Sve nepročitane poruke su prosleđene."
 
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Pusti zvuk kada je korisnik zauzet"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3378,7 +3359,7 @@ msgstr "Koristi DBus i demon obaveštenja za prikazivanje obaveštenja"
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+msgstr "Prikaži u listi samo kontakte koji su na vezi i slobodni za ćaskanje."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3412,51 +3393,48 @@ msgstr ""
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
+"Kada prikazati ikonicu u sistemskoj kaseti. Može biti 'never', 'on_event', "
+"'always'."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Neispravan nadimak"
+msgstr "Boja za dolazni nadimak."
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Boja za odlazni nadimak."
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Boja dolaznog teksta."
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Boja odlaznog teksta."
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "tekst statusne poruke"
+msgstr "Boja teksta statusne poruke."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Neispravan nadimak"
+msgstr "Font dolaznog nadimka."
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Promena nadimka"
+msgstr "Font odlaznog nadimka."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Font dolaznog teksta."
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Font odlaznog teksta."
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "tekst statusne poruke"
+msgstr "Font teksta statusne poruke."
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3465,9 +3443,9 @@ msgstr ""
 "Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "podrazumevano"
 
@@ -3571,17 +3549,19 @@ msgstr "Koliko minuta da traju linije prethodnog razgovora."
 
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
-msgstr ""
+msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr ""
+msgstr "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Koliko sekundi čekati pre ponovnog automatskog pridruživanja sobi sa koje "
+"ste raskačeni. Staviti 0 da onemogućite ponovno automatsko pridruživanje."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3667,6 +3647,9 @@ 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 ""
+"Pitaj pre zatvaranja jezička ćaskanja ako postoji kontrola koja može "
+"izgubiti podatke (ćaskanje, privatno ćaskanje, grupni razgovor koji neće "
+"biti minimizovan)"
 
 #: ../src/common/config.py:192
 msgid ""
@@ -3904,26 +3887,24 @@ msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
-"Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazan niz znači "
-"da nikada ne prikazujemo upit."
+"Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazna niska "
+"znači da nikada ne prikazujemo dijalog."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazan niz znači "
-"da nikada ne prikazujemo upit."
+"Treba li prikazivati dijalog za potvrdu blokiranja kontakta? Prazna nista "
+"znači da nikada ne prikazujemo dijalog."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazan niz znači "
-"da nikada ne prikazujemo upit."
+"Treba li prikazivati dijalog za potvrdu prilagođenog statusa? Prazna niska "
+"znači da nikada ne prikazujemo dijalog."
 
 #: ../src/common/config.py:259
 msgid ""
@@ -3944,12 +3925,11 @@ msgstr ""
 "uskladišti lozinke naloga."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
+"Ako je istinito, Gajim će koristiti KDE Novčanik (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
 #: ../src/common/config.py:262
@@ -4016,29 +3996,34 @@ msgid ""
 msgstr "Promenite vrednost da promenite veličinu Lateks formula. Više je veće."
 
 #: ../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)"
 msgstr ""
 "Ispravne uri šeme. Samo šeme sa ove liste će biti prihvaćene kao \"stvarne\" "
-"uri."
+"uri. (mailto i xmpp se obrađuju zasebno)"
 
 #: ../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 ""
+"Pitaj za statusne poruke van veze za sve kontakte koji nisu na vezi kada se "
+"uspostavi veza sa nalogom. UPOZORENJE: ovo će poslati mnogo zahteva serveru!"
 
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Ako je True, dopunjavanje u grupnim razgovorima će biti kao dopunjavanje u "
+"konzoli"
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"Kada se prikazuje sopstveni kontakt. Može biti \"always\", "
+"\"when_other_resource\" or \"never\""
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4054,7 +4039,7 @@ msgid ""
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 "Status sa kojim se automatski povezujete. Može biti online, chat, away, xa, "
-"dnd, invisible. PAŽNjA: ova opcija se koristi samo ako je "
+"dnd, invisible. PAŽNJA: ova opcija se koristi samo ako je "
 "restore_last_status  onemogućena."
 
 #: ../src/common/config.py:295
@@ -4065,12 +4050,14 @@ msgstr "Ako je omogućeno, postavi poslednji korišćeni status."
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
+"Ako je True, kontakti koji traže autorizaciju će automatski biti prihvaćeni."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
-msgstr "Ako nije istinito, nećete više videti avatar u prozoru razgovora."
+msgstr ""
+"Ako je False, nalog će biti onemogućen i neće se prikazivati u listi "
+"kontakata."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4111,19 +4098,18 @@ msgstr "Lista ssl grešaka za ignorisanje, odvojena razmacima."
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Slanje belina posle neaktivnosti"
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "Slanje XMPP pinga posle neaktivnosti"
 
 #: ../src/common/config.py:323
-#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
-"Koliko sekundi čekati na odgovor o pkaetima o živosti pre nego što pokušamo "
+"Koliko sekundi čekati na odgovor o paketima o živosti pre nego što pokušamo "
 "ponovno uspostavljanje veze."
 
 #. yes, no, ask
@@ -4131,7 +4117,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 privremeno rešenje"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4139,15 +4125,15 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti Vašu IP adresu u proksi koji je "
 "difinisan u file_transfer_proxies podešavanjima za prenos."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtev primanja"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Poslati zahtev primanja"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4155,11 +4141,11 @@ msgstr ""
 "Kada se uspostavlja šifrovana sesija, da li Gajim treba da pretpostavi da "
 "želite da čuvate poruke u dnevniku?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4167,101 +4153,101 @@ msgstr ""
 "Da li Gajim treba automatski da započne šifrovanu vezu sa ovim kontaktom "
 "kada je moguće?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik u kome želite proveravati neispravno napisane reči"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'da', 'ne', ili 'oboje'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'da', 'ne' ili ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite poruku."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Radim."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Napolju"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4270,99 +4256,97 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitavanje modula idle"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Loš host"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Nevalidna lokalna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informacije o registraciji za transport %s nisu došle na vreme"
 
-#: ../src/common/connection_handlers.py:685
-#, fuzzy
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
-msgstr "Registruj se na %s"
+msgstr "Registracija uspešna"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Registracija sa agentom %s uspešna"
 
-#: ../src/common/connection_handlers.py:688
-#, fuzzy
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
-msgstr "Veza prekinuta"
+msgstr "Registracija neuspela"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
+"Registracija sa agentom %(agent)s neuspela uz grešku %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Nalog %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
+msgstr "Poruka od neispravnog džaber ID-a, ignorisana je."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4372,7 +4356,7 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili  uklonite (sav "
 "istorijat poruka će biti izgubljen)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljen nadimak: %s "
@@ -4380,76 +4364,76 @@ msgstr "Nedozvoljen nadimak: %s "
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Dostignut najveći broj korisnika za %s"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Soba grupnog razgovora je uništena"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se priključiti sobi %s umesto ove"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Želeo bih da te dodam na moju listu kontakata."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada ste pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zahtev za ukidanje pretplate od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada Vam je ukinuta pretplata od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4587,77 +4571,105 @@ msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Nije moguće poslati poruku za %s, ovaj džaber ID nije ispravan."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Niti je udaljeno prisustvo potpisano, niti je ključ dodeljen."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr "Ključ kontakta (%s) ne poklapa se sa ključem pridruženim u Gajimu."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Ova poruka je *šifrovana* (Pogledajte :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tema: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Izgubljena veza sa računom \"%s\""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Ponovo se povežite ručno."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s je loše odgovorio na zahtev registracije:: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s je ponudio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Neispravan odgovor"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s je loše odgovorio na zahtev registracije: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Sačuvano u: %s"
+msgstr "Server je odgovorio: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Veza sa %s nije moguća"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Izgubljena veza sa nalogom %s. Pokušajte ponovo da se konektujete."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentičnost sertifikata %s može biti neispravna."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4666,7 +4678,7 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4675,24 +4687,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
-msgstr "Autentikacija sa \"%s\" neuspešna"
+msgstr "Prijavljivanje sa \"%s\" neuspešno"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Molimo Vas da proverite Vaše korisničko ime i lozinku od grešaka."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom uklanjanja lista privatnosti"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4701,76 +4713,43 @@ msgstr ""
 "Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od Vaših "
 "resursa na vezi. Deaktivirajte je tamo i pokušajte ponovo."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Nije moguće poslati praznu datoteku"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Niti je udaljeno prisustvo potpisano, niti je ključ dodeljen."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Ključ kontakta (%s) ne poklapa se sa ključem pridruženim u Gajimu."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Ova poruka je *šifrovana* (Pogledajte :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Tema: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Poslati kontakti: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Pozovi kontakte"
+msgstr "Poslati kontakti:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Veza prekinuta"
+msgstr "Odjava registracije neuspela"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+msgstr "Odjava registracije sa serverom %(server)s neuspela: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Prenosi"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Nije u listi kontakata"
 
@@ -4786,7 +4765,7 @@ msgstr "D-Bus mogućnosti Gajima se ne mogu koristiti"
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus ne radi ispravno na ovom računaru"
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -5017,7 +4996,7 @@ msgstr "Slobodan za razgovor"
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Dostupan"
 
@@ -5135,48 +5114,48 @@ msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5184,22 +5163,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " iz sobe %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " od korisnika %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5207,7 +5186,7 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaj na čekanju"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5223,652 +5202,673 @@ msgid "%s is not a valid loglevel"
 msgstr "%s nije ispravan nivo logovanja"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "greška: ne mogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
 #: ../src/common/passwords.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "naloga %s"
+msgstr "XMPP nalog %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Uplašen"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Oduševljen"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Zaljubljen"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Ljut"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Iznerviran"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Anksiozan"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Napaljen"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Posramljen"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Smoren"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Hrabar"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Miran"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Oprezan"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Smrznut"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Pouzdan"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Zbunjen"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Zadubljen u misli"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Zadovoljan"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Na kraju živaca"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Lud"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Kreativan"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Zainteresovan"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Potišten"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Depresivan"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Razočaran"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Zgađen"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Skrhan"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Ometen"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Postiđen"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Zavidljiv"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Za flertovanje"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustriran"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Zahvalan"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "U patnji"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Mrgudan"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Kriv"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Srećan"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "U nadanju"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Naložen"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Skroman"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Ponižen"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Gladan"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Povređen"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Impresioniran"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Očaran"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Ozlojeđen"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Zainteresovan"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Otrovan"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Nepobediv"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Usamljen"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Izgubljen"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Srećan"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Zloban"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Raspoložen"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervozan"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutralan"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Uvređen"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Pobesneo"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Igrao bi se"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Ponosan"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Opušten"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Olakšan"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Samilostan"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Neumoran"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Tužan"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarkastičan"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Zadovoljan"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Ozbiljan"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Šokiran"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Stidljiv"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Bolestan"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Pod stresom"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Jak"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Iznenađen"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Zahvalan"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Žedan"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Umoran"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Nedefinisan"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Slab"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Zabrinut"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Obavlja rutinu"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Kupuje namirnice"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Čisti"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Kuva"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Obavlja održavanje"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Pere sudove"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Pere veš"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Baštovani"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Na zadatku"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Šeta psa"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Pije"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Pije pivo"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Pije kafu"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Pije čaj"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Užina"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Doručkuje"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Ruča"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Večera"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Vežba"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Vozi biciklu"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Pleše"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Šeta"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Džogira"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Bavi se sportom"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Trči"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Skija"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Pliva"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Vežba"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Češlja se"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "U banji"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Pere zube"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Šiša se"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Brije se"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Kupa se"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Tušira se"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "Sastanči"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Slobodan dan"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Bleji"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Krije se"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "Na odmoru"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Moli se"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Zakazani odmor"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Razmišlja"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Odmara se"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Peca"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Igra igrice"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Izlazi napolje"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Na provodu"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Čita"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Uvežbava"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "U šopingu"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Puši"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Druži se"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Sunča se"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Gleda TV"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Gleda film"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Priča"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "U stvarnom životu"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Telefonira"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Na video telefonu"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Putuje"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Muva se"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Vozi"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "U kolima"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "U autobusu"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "U avionu"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "U vozu"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "Na putu"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Šeta"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Programira"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "Na sastanku"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Uči"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Piše"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Nepoznat izvođač"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Nepoznat naslov"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Nepoznat izvor"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
+"iz <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5890,38 +5890,11 @@ msgid ""
 msgstr ""
 "[Ovo je deo šifrovane sesije. Ukoliko vidite ovo, nešto je pošlo naopako.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Host %s koji ste postavili kao ft_add_host_to_send napredno podešavanje nije "
-"ispravan. pa je ignorisan."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Lozinka za OpenPGP nije uneta"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Povezaćete se na %s bez OpenPGP ključa."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Ako želite nastaviti sa slanjem i primanjem poruka, morate se isključiti i "
-"ponovo doći na vezu."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5930,52 +5903,44 @@ msgstr ""
 "%s\n"
 "Poruke lokalne mreže možda neće raditi kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalni servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ne mogu se povezati na port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Molimo proverite da li je avahi-demon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promeniti status računa \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Niste spojeni ili ste nevidljivi za druge. Vaša poruka ne može biti poslata."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Ova poruka je šifrovana]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Vaša poruka nije mogla biti poslata."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt nije na vezi. Vašu poruku nije moguće poslati."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5987,24 +5952,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja servisa. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Podrazumevana poruka"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Omogućen"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6013,217 +5978,214 @@ msgstr ""
 "Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
 "ili odaberite drugi jezik postavkom speller_language opcije."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Otići sa veze i povezati se odmah?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promene trenutno primene, morate da se ponovo povežete."
 
-#: ../src/config.py:1559 ../src/config.py:1684
-#, fuzzy
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računaru"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju pre uklanjanja naloga."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na server"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promenu imena naloga, morate otići sa veze."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da biste promenili ime naloga, morate prvo pročitati sve događaje na čekanju."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Ime Naloga Već U Upotrebi"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ovo ime već koristi jedan od Vaših naloga. Molimo Vas, odaberite drugo ime."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Neispravno ime naloga"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Ime naloga ne može biti prazno."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Ime naloga ne može da sadrži beline."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Preimenuj nalog"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za nalog%s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Džaber ID mora biti oblika \"korisnik@server\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Neuspelo uzimanje tajnih ključeva"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "Došlo je do problema u uzimanju Vaših OpenPGP tajnih ključeva."
+msgstr "Nema dostupnih OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite Vaš OpenPGP ključ"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Nije dostupan takav nalog"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napraviti Vaš nalog pre izmena ličnih informacija."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez veze sa serverom, nije moguća izmena ličnih informacija."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš server ne podržava Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Vaš server ne može da sačuva Vaše lične informacije."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
-msgstr "Za promenu imena naloga, morate otići sa veze."
+msgstr "Da biste onemogućili nalog, morate biti raskačeni."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Račun lokal već postoji."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Molimo Vas, preimenujte ili uklonite pre omogućavanja lokalnih poruka."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Izmeni %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registruj se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Lista zabrana"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Lista članova"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Lista vlasnika"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Lista administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
-msgstr "DžID"
+msgstr "DŽID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Zabrana..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6231,11 +6193,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Dodavanje člana..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6243,11 +6205,11 @@ msgstr ""
 "<b>Koga želite da postavite članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Dodavanje vlasnika..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6255,11 +6217,11 @@ msgstr ""
 "<b>Koga želite da postavite za vlasnika?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Dodavanje administratora..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6267,8 +6229,7 @@ msgstr ""
 "<b>Koga želite da postavite za administratora?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6284,88 +6245,86 @@ msgstr ""
 "4. domen (samo se domen poklapa, kao i bilo koji korisnik@domen,\n"
 "domen/resurs, ili adresa koja sadrži poddomen."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje računa %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?ispis statusa:Sve"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Samo ući i napustiti"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Novi grupni razgovor"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Ovaj marker ima neispravne podatke"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Molimo obavezno ispunite polja servera i sobe ili uklonite ovaj marker."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Nedozvoljen nadimak: %s "
+msgstr "Karakter nije dozvoljen"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Neispravan server"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Neispravan unos"
+msgstr "Neispravna soba"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Nalog je uspešno dodat"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6375,32 +6334,32 @@ msgstr ""
 "ili kasnije, klikom na stavku menija Nalozi pod menijem Uredi iz glavnog "
 "prozora."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi nalog je uspešno napravljen"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo odredite server na kome želite da se registrujete."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Sertifikat je već u datoteci %s, pa nije ponovo dodat."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6415,7 +6374,7 @@ msgstr ""
 "SSL greška: %(error)s\n"
 "Da li i dalje želite da se povežete na ovaj server?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6426,63 +6385,63 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Ime naloga je već upotrebljeno"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Već imate nalog sa tim imenom."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "događaj"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Primljena Prva Poruka"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Sledeća Primljena Poruka Fokusirana"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Sledeća Primljena Poruka Nefokusirana"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt Na Vezi"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt Otišao Sa Veze"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Poruka Poslata"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Primljen Gmail e-mejl"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6492,7 +6451,7 @@ msgstr ""
 "stigla na drugi kraj. Ako ova ikona ostane ovako \n"
 "dugo vremena, verovatno je da se poruka izgubila."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6500,225 +6459,222 @@ msgstr ""
 "Tekst ispod ove linije je ono što je rečeno od kada ste poslednji put\n"
 "obratili pažnju na ovaj grupni razgovor"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "_Izlaz"
+msgstr "_Citat"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za nalog \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Vikipediji"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Potraži u Rečniku"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u Rečnika nedostaje \"%s\" i nije Viki rečnik"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Veb pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Pretraži Veb"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Otvori kao _Vezu"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Juče"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "Pre %i dana"
+msgid_plural "%i days ago"
+msgstr[0] "Juče"
+msgstr[1] "Juče"
+msgstr[2] "Juče"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Džaber ID već u listi kontakata"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Džaber ID koji ste uneli je već na listi. Odaberite neki drugi."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Džaber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "ID Ključa"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Postavi raspoloženje"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna poruka"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Statusna poruka"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Prepiši statusnu poruku?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ovo ime se već koristi. Da li želite da prepišete ovu statusnu poruku?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Snimi kao već postavljenu statusnu poruku"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati na nalog %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Neispravan korisnički ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakt je već u listi"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je već u listi kontakata."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "ID korisnika:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "GTK+ džaber klijent"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ verzija:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK verzija:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Trenutni programeri:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Prošli programeri:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "ZAHVALNICE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Poslednje, ali ne i najmanje važno, želeli bismo zahvaliti svim "
 "održavateljima paketa"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6731,98 +6687,100 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtev pretplate na račun %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtev pretplate od %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružite se grupnom razgovoru preko naloga %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Neispravno ime naloga"
+msgstr "Neispravan nalog"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Nalog sa koga želite da uđete u sobu"
+msgstr "Morate odabrati nalog sa koga želite da uđete u sobu."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete se sinhronizovati sa nalogom ako niste povezani."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započni razgovor sa razunom %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6831,300 +6789,326 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće razložiti \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promena lozinke."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Morate da unesete lozinku"
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakt je na vezi"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nova Samostalna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Poziv na grupni razgovor"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakt promenio status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Tužan"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Izmenite"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "_Ukloni"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Želio bih da Vas dodam na listu mojih kontakata."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> želi da <b>%s</b> neke kontakte u listu vaših kontakata."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
-msgstr ""
+msgstr "Dodate"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Raspoložen"
+msgstr "Izmenite"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Džaber ID:"
+msgstr "Džaber ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Grupa"
+msgstr "Grupe"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Želeo bih da te dodam na moju listu kontakata."
+msgstr "%s je predložio da vas dodam u listu mojih kontakata."
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Dodaj _kontakt"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Uklanja kontakt sa liste"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Redosled: %(order)s, akcija: %(action)s, tip: %(type)s, vrednost: %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosled: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmeni pravilo</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Neispravno ime liste"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vas je pozvao na grupni razgovor u sobu %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Odaberite zvuk"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje posebnog obaveštenja za %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Uslov"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7135,19 +7119,19 @@ msgstr ""
 "\n"
 "Kratka Autentikaciona Niska ove sesije je: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Identitet kontakta potvrđen"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Potvrdite ponovo..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7157,19 +7141,19 @@ msgstr ""
 "poruke ili da Vam šalju poruke, morate potvrditi njihov identitet klikajući "
 "dugme ispod."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Identitet kontakta NIJE potvrđen"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Da li ste proverili identitet kontakta?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7183,23 +7167,23 @@ msgstr ""
 "da li i on ima istu kratku Autentikacionu nisku kao vi.\n"
 "Kratka Autentikaciona Niska ove sesije: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Da li ste razgovarali sa kontaktom i potvrdili KAN?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Ključ kontakta (%s) <b>ne poklapa se</b> sa ključem pridruženim u Gajimu."
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nijedan GPG ključ nije dodeljen kontaktu. Ne možete mu slati šifrovane "
 "poruke."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7208,7 +7192,7 @@ msgstr ""
 "da poruke <b>ne mogu</b> biti šifrovane. Upotrebite Vašeg GPG klijenta da "
 "date poverenje ovom ključu."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7216,6 +7200,25 @@ msgstr ""
 "GPG ključ je dodeljen ovom kontaktu i Vi verujete ovom ključu tako da će "
 "poruke biti šifrovane."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Ostali"
@@ -7225,24 +7228,24 @@ msgstr "Ostali"
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Usluga ne može biti nađena"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7250,242 +7253,233 @@ msgstr ""
 "Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Usluge nisu pretražive"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Ovaj tip usluge ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Neispravano ime servera"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretražujem %(address)s koristeći nalog %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Izvrši naredbu"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Marker je već postavljen"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni razgovor \"%s\" je već markiran."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Marker uspešno dodat"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Možete upravljati Vašim markerima pomoću menija Akcije iz Vaše liste "
 "kontakata."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Pretplaćen"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
-#: ../src/features_window.py:46
-#, fuzzy
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
-msgstr "Greška SSL sertifikata"
+msgstr "Validacija SSL sertifikata"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Biblioteka koja se koristi da proveri sertifikate servera i osigura sigurnu "
 "vezu."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Zahteva python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Razgovor bez servera sa autodetekcijom klijenata u lokalnoj mreži."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Zahteva python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Zahteva pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
-#, fuzzy
+#: ../src/features_window.py:56
 msgid "Command line"
-msgstr "Komanda: %s"
+msgstr "Komandna linija"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Skripta za kontrolu Gajima iz komandne linije."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Zahteva python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Mogućnost nije dostupna pod Vindouz sistemom."
 
-#: ../src/features_window.py:58
-#, fuzzy
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
-msgstr "Odabir OpenPGP Ključeva"
+msgstr "Šifrovanje OpenPGP poruke"
 
-#: ../src/features_window.py:59
-#, fuzzy
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Šifrujem poruke razgovora sa gpg ključevima."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Zahteva gpg i python-GnuPGInterface."
 
-#: ../src/features_window.py:62
-#, fuzzy
+#: ../src/features_window.py:64
 msgid "Network-manager"
-msgstr "network-manager"
+msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Autodetekcija statusa mreže."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Zahteva gnome-network-manager i python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Menadžment sesija"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesija je sačuvana na prekidu veze i učitana po logovanju."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Zahteva python-gnome2."
 
-#: ../src/features_window.py:70
-#, fuzzy
+#: ../src/features_window.py:72
 msgid "Password encryption"
-msgstr "Lozinka za ulazak u sobu"
+msgstr "Šifrovanje lozinkom"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lozinke se mogu sačuvati i pouzdanije od običnog teksta."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Zahteva gnome-keyring and python-gnome2-desktop."
+msgstr "Zahteva gnome-keyring and python-gnome2-desktop, ili kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Daje mogućnost konekcije na servere koji koriste SRV zapise."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Zahteva dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Zahteva nslookup da biste koristili SRV zapise."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Provera pravopisa"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Provera pravopisa sastavljenih poruka."
 
-#: ../src/features_window.py:80
-#, fuzzy
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
-msgstr "Zahteva python-sexy."
+msgstr "Zahteva libgtkspell."
 
-#: ../src/features_window.py:82
-#, fuzzy
+#: ../src/features_window.py:84
 msgid "Notification"
-msgstr "Obaveštenja"
+msgstr "Obaveštenje"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Pasivna iskačuća obaveštenja o novim događajima."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7493,54 +7487,33 @@ msgstr ""
 "Zahteva python-notify ili, umesto toga python-dbus u sprezi sa notification-"
 "daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Ikona sistemske kasete"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Ikona u sistemskoj kaseti odražava trenutno stanje."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Zahteva python-gnome2-extras ili kompajliranje trayicon modula iz Gajim "
-"izvornog koda."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Zahteva PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
-#, fuzzy
 msgid "Automatic status"
-msgstr "_Podesi prema statusu"
+msgstr "Automatski status"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Daje mogućnost merenja vremena kada se ništa ne dešava, da se odredi auto "
 "status."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
-msgstr ""
+msgstr "Zahteva libxss biblioteku."
 
-#: ../src/features_window.py:93
-#, fuzzy
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
-msgstr "Zahteva python-gnome2."
+msgstr "Zahteva python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Pretvara LaTeX izraze između $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7548,7 +7521,7 @@ msgstr ""
 "Zahteva texlive-latex-base, i dvipng. Morate podesiti'use_latex' na True u "
 "editoru naprednih podešavanja."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7556,25 +7529,23 @@ msgstr ""
 "Zahteva texlive-latex-base i dvipng (sve iz MikTeX-a). Morate "
 "podesiti'use_latex' na True u editoru naprednih podešavanja."
 
-#: ../src/features_window.py:98
-#, fuzzy
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
-msgstr "Enkripcija s kraja na kraj"
+msgstr "Šifrovanje poruke s kraja na kraj"
 
-#: ../src/features_window.py:99
-#, fuzzy
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Šifrujem poruke razgovora."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Zahteva python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST generator"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7582,24 +7553,37 @@ msgstr ""
 "Generiše XHTML izlaz od RST koda (pogledati http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Zahteva python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Baneri i linkovi na koje se može kliknuti"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Daje mogućnost da imate linkove na koje se može kliknuti u razgovorima."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Zahteva python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Zahteva python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Mogućnost"
 
@@ -7615,139 +7599,138 @@ msgstr "Vreme"
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Veličina: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošaljilac: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Primaoc: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sačuvano u: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke prekinut"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primaoc: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka greške: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Odaberite datoteku za slanje..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Opis:"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Datoteka sa ovim imenom već postoji i nemate privilegijaprepisati je."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Šta želite da uradite?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U fasciklu \"%s\" nije moguće pisanje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate privilegija za pisanje u ovoj fascikli"
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Snimi datoteku kao..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7755,32 +7738,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/sek)"
 
-#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Neispravna datoteka"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Datoteka: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Pošaljilac: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Pauza"
 
@@ -7791,27 +7774,23 @@ msgstr "Gajimu treba X server da bi se pokrenuo. Završavam..."
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "neuspelo uvoženje PyGTK modula: %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajimu treba pyGTK 2.8 ili veća verzija"
+msgstr "Gajimu treba pyGTK 2.12 ili veća verzija"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajimu treba pyGTK 2.8 ili veća verzija. Završavam..."
+msgstr "Gajimu treba pyGTK 2.12 ili veća verzija. Završavam..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajimu treba pyGTK 2.8 ili veća verzija"
+msgstr "Gajimu treba GTK 2.12 ili veća verzija"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajimu treba pyGTK 2.8 ili veća verzija. Završavam..."
+msgstr "Gajimu treba GTK 2.12 ili veća verzija. Završavam..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7850,11 +7829,11 @@ msgstr ""
 "naći na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7862,464 +7841,28 @@ msgstr ""
 "Jedna instanca Gajima izgleda već radi\n"
 "Svejedno želite pokrenuti?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Lozinka neophodna"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Nema dodeljenog GPG ključa"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Povezaćete se na %s bez OpenPGP ključa."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Neispravna lozinka"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Vaš željeni nadimak je trenutno u upotrebi u grupnom razgovoru %s ili je "
-"registrovan od strane nekog od učesnika.\n"
-"Molimo odredite drugi nadimak ispod:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Prihvatate li ovaj zahtev?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Veza prekinuta"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Greška %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "greška prilikom slanja %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Zahtev za pretplatom"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Autorizacija prihvaćena"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" je prihvatio da vidite njegov/njen status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Uvek ćete ga/je videti kao da nije na vezi.\n"
-"Da li želite da ga/je uklonite sa liste kontakata?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "_Ukini pretplatu"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s je trenutno %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s je postavio temu na %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Soba sada prikazuje nedostupne članove"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "soba sada ne prikazuje nedostupne članove"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"Desila se promena u konfiguraciji sobe (napomena: ne utiče na privatnost "
-"korisnika)"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Logovanje u sobi je sada omogućeno"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Logovanje u sobi je sada onemogućeno"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Soba sada više nije anonimna"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Soba je sada polu anonimna"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Soba je sada potpuno anonimna"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Lozinka potrebna za pridruživanje grupnom razgovoru %s. Unesite je."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Konfigurisali ste Gajim da koristi GPG agenta, ali ne postoji GPG agent koji "
-"radi ili je vratio lošu frazu lozinke.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Trenutno ste povezani bez OpenPGP ključa."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Vaša lozinka nije tačna"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Vaša lozinka nije tačna"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG nije upotrebljiv"
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"Nijedan GPG ključ nije dodeljen kontaktu. Ne možete mu slati šifrovane "
-"poruke."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "_Ne pitaj me više"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring je instaliran, ali nije \t\t\t\t\t\t\tpravilno startovan"
-"(promenljive okruženja verovatno nisu \t\t\t\t\t\t\tpravilno podešene)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Novi e-mejl za %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Imate %d novi e-mejl razgovor"
-msgstr[1] "Imate %d nova e-mejl razgovora"
-msgstr[2] "Imate %d novih e-mejl razgovora"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Od: %(from_address)s\n"
-"Tema: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s Vam želi poslati datoteku."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Uklanja kontakt sa liste"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Greška pri čitanju datoteke:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Uspešno ste primili datoteku %(filename)s od kontakta %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Uspešno ste poslali datoteku %(filename)s za kontakt %(name)s"
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Ne mogu da dešifrujem poruku od kontakta %s\n"
-"Možda je promenjena."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Ne mogu da dešifrujem poruku"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Konflikt korisničkog imena"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Greška."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Konflikt resursa"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Već ste konektovani na ovaj nalog sa istim resursem. Molimo Vas, otkucajte "
-"novo ime resursa"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Greška pri verifikaciji SSL sertifikata"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Došlo je do greške prilikom verifikovanja SSL sertifikata Vašeg džaber "
-"servera:%(error)s\n"
-"Da li i dalje želite da se konektujete na ovaj server?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignoriši ovu grešku za ovaj sertifikat."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Greška SSL sertifikata"
-
-#: ../src/gajim.py:2193
-#, fuzzy, python-format
-msgid ""
-"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 ""
-"Čini se da se SSL sertifikat promenio ili je Vaša konekcija napadnuta.\n"
-"Stari otisak: %(old)s\n"
-"Novi otisak: %(new)s\n"
-"\n"
-"Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Nesigurna veza"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Upravo ćete poslati lozinku preko nešifrovane veze. Jeste li sigurni da "
-"želite to da uradite?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
-"PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "PEP čvor nije uklonjen"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Smajliji isključeni"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr "Vaša tema za smajlije nije nađena, pa su smajliji isključeni."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Vaša tema za smajlije ne može da se učita. Možda treba da unapredite format "
-"emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/Emoticons za "
-"više detalja."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Nije moguće čuvanje Vaših podešavanja"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste kontakata "
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Iskače prozor sa sledećim događajem na čekanju"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8327,51 +7870,51 @@ msgstr ""
 "Ispisuje listu svih kontakata sa liste kontakata. Svaki kontakt je u "
 "posebnoj liniji"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "nalog"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "prikazuje samo kontakte sa ovog naloga"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registrovanih naloga"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Menja status jednog ili više naloga"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
 "uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "poruka"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8380,48 +7923,43 @@ msgstr ""
 "svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
 msgstr "Menja status jednog ili više naloga"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Priori_tet"
+msgstr "prioritet"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Želim da registrujem novi nalog"
+msgstr "prioritet koji želite da date ovom nalogu"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"izmena statusa naloga \"nalog\". Ako nije određen, pokušaj promene statusa "
-"svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
-"statusom\""
+"izmena prioriteta datog naloga. Ako nije određen, menja se status svih "
+"naloga koji imaju postavljenu opciju \"sinhronizacija sa globalnim statusom\""
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Prikazuje dijalog razgovora kako biste mogli razgovarati sa kontaktom"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Džaber ID kontakta sa kojim želite razgovarati"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je naznačeno, kontakt se uzima sa liste kontakata ovog naloga"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "sadržaj poruke. Nalog mora biti naznačen ili \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8431,29 +7969,29 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp ključ"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je naznačeno, poruka će biti šifrovana koristeći ovaj javni ključ"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je naznačeno, poruka će biti poslata koristeći ovaj nalog"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8463,135 +8001,135 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku na grupni razgovor kome ste se pridružili."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Džaber ID kontakta"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o nalogu"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Ime naloga"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Šalje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Putanja do datoteke"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "ako je naznačeno, datoteka će biti poslata koriteći ovaj nalog"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Prikazuje sva podešavanja i njihove vrednosti"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ključ=vrednost"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime stavke podešavanja, 'vrednost' je vrednost na koju će se "
 "stavka postaviti"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Briše stavku podešavanja"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "ime stavke podešavanja koje će se brisati"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim podešavanja u .config datoteku"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "džid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Dodaje novi kontakt ovom računu"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ako nije naznačen nalog)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvara dijalog za započinjanje razgovora"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj nalog"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Šalje korisnički definisan XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8599,72 +8137,71 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Upravlja xmpp:/ uri-jem"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI za upravljanje"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Nalog u kome želite da upravljate njime"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "sadržaj poruke"
+msgstr "Sadržaj poruke"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Pridruži se novoj sobi"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "Džaber ID sobe:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Nadimak za korišćenje"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Lozinka za ulazak u sobu"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Nalog sa koga želite da uđete u sobu"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Molimo proverite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8673,15 +8210,15 @@ msgstr ""
 "'%s' nije na Vašj listi.\n"
 "Molimo odredite nalog za slanje poruke."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Čini se da Gajim ne radi. Ne možete da koristite gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8690,16 +8227,16 @@ msgstr ""
 "Korišćenje: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8708,7 +8245,7 @@ msgstr ""
 "Korišćenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8717,7 +8254,7 @@ msgstr ""
 "Previše argumenata\n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8726,7 +8263,7 @@ msgstr ""
 "Argument \"%(arg)s\" nije naveden. \n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Loš uri"
 
@@ -8755,152 +8292,176 @@ msgstr "Ne možete izbrisati Vašu trenutnu temu"
 msgid "Please first choose another for your current theme."
 msgstr "Molimo Vas da prvo odaberete neku drugu temu."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Više niste u grupnom razgovoru \"%(room)s\" ili je \"%(nick)s\" otišao."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Logovanje sobe je omogućeno"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Nova soba je napravljena"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Server Vam je ili dodelio nadimak ili promenio postojeći"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranu od člana %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "gašenje sistema"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Afilijacija %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Afilijacija %(nick)s je postavljena na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s je otišao"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je trenutno %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, bićete isključeni sa ovoh grupnog razgovora."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "_Ne pitaj me više"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Promena Teme"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Molimo odredite novu temu:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Promena nadimka"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo odredite novi nadimak koji želite da koristite:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8908,22 +8469,22 @@ msgstr ""
 "Upravo ćete zauvek uništiti ovu sobu.\n"
 "Možete ispod napisati razlog:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
@@ -8947,59 +8508,473 @@ msgid "Details"
 msgstr "Detalji"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Greška pri učitavanju datoteke"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nije moguće pisati u %s. Upravljanje sesijama neće biti moguće"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije Vaš podrazumevani džaber klijent"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Želite li da Vam Gajim postane podrazumevani Gajim klijent?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Uvek na startovanju proveravaj da li je Gajim podrazumevani džaber klijent"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Ekstenzija nije podržana"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Sliku nije moguće sačuvati u %(type)s formatu. Sačuvati kao %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Snimi sliku kao..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Vaš željeni nadimak je trenutno u upotrebi u grupnom razgovoru %s ili je "
+"registrovan od strane nekog od učesnika.\n"
+"Molimo odredite drugi nadimak ispod:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Uvek koristi nadimak kada postoji konflikt"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Prihvatate li ovaj zahtev?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Veza prekinuta"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Greška %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "greška prilikom slanja %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Zahtev za pretplatom"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Autorizacija prihvaćena"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" je prihvatio da vidite njegov/njen status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Uvek ćete ga/je videti kao da nije na vezi.\n"
+"Da li želite da ga/je uklonite sa liste kontakata?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "Ukinuta pretplata"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s je postavio temu na %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Soba sada prikazuje nedostupne članove"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "soba sada ne prikazuje nedostupne članove"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Desila se promena u konfiguraciji sobe (napomena: ne utiče na privatnost "
+"korisnika)"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Logovanje u sobi je sada omogućeno"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Logovanje u sobi je sada onemogućeno"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Soba sada više nije anonimna"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Soba je sada polu anonimna"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Soba je sada potpuno anonimna"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Lozinka potrebna za pridruživanje grupnom razgovoru %s. Unesite je."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Konfigurisali ste Gajim da koristi GPG agenta, ali ne postoji GPG agent koji "
+"radi ili je vratio lošu frazu lozinke.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Trenutno ste povezani bez OpenPGP ključa."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Vaša lozinka nije tačna"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "OpenGPG lozinka nije tačna"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG ključ nije od poverenja"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"GPG ključ koji se koristi za šifrovanje nije od poverenja. Da li zaista "
+"želite da šifrujete ovu poruku?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring je instaliran, ali nije \t\t\t\tpravilno pokrenut (promenljive "
+"okruženja verovatno nisu \t\t\tpravilno podešene)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Novi e-mejl za %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Imate %d novi e-mejl razgovor"
+msgstr[1] "Imate %d nova e-mejl razgovora"
+msgstr[2] "Imate %d novih e-mejl razgovora"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Od: %(from_address)s\n"
+"Tema: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s Vam želi poslati datoteku."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Udaljeni kontakt je prekinuo prenos"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Greška pri otvaranju datoteke"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Uspešno ste primili datoteku %(filename)s od kontakta %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Uspešno ste poslali datoteku %(filename)s za kontakt %(name)s"
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Ne mogu da dešifrujem poruku od kontakta %s\n"
+"Možda je promenjena."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Ne mogu da dešifrujem poruku"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Konflikt korisničkog imena"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Greška."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Konflikt resursa"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Već ste konektovani na ovaj nalog sa istim resursem. Molimo Vas, otkucajte "
+"novo ime resursa"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s Vam želi poslati datoteku."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Zahtev za prenosom datoteke"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Greška pri verifikaciji SSL sertifikata"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Došlo je do greške prilikom verifikovanja SSL sertifikata Vašeg džaber "
+"servera:%(error)s\n"
+"Da li i dalje želite da se konektujete na ovaj server?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignoriši ovu grešku za ovaj sertifikat."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Greška SSL sertifikata"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Čini se da se SSL sertifikat naloga %(account)s promenio ili je Vaša "
+"konekcija napadnuta.\n"
+"Stari otisak: %(old)s\n"
+"Novi otisak: %(new)s\n"
+"\n"
+"Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Nesigurna veza"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Upravo ćete poslati lozinku preko nešifrovane veze. Jeste li sigurni da "
+"želite to da uradite?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
+"PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP čvor nije uklonjen"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Smajliji isključeni"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr "Vaša tema za smajlije nije nađena, pa su smajliji isključeni."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Vaša tema za smajlije ne može da se učita. Možda treba da unapredite format "
+"emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/Emoticons za "
+"više detalja."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Nije moguće čuvanje Vaših podešavanja"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Lozinka neophodna"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "GPG ključ istekao"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Vaš GPG ključ je istekao, bićete povezani sa %s bez OpenPGP-a."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Neispravna lozinka"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Novi grupni razgovor"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Želeo bih Vas dodati na moju listu kontakata"
 
@@ -9014,7 +8989,7 @@ msgstr "Kontakti"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Datum"
 
@@ -9025,7 +9000,7 @@ msgstr "Nadimak"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Poruka"
 
@@ -9050,195 +9025,192 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, molimo sačekajte..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Izvoženje dnevnika istorijata..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s u %(time)s kaže: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Da li zaista želite izbrisati dnevnik razgovora označenog kontakta?"
 msgstr[1] ""
 "Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
 msgstr[2] ""
+"Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Ova operacija je nepovratna."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Da li zaista želite da izbrišete označenu poruku?"
 msgstr[1] "Da li zaista želite da izbrišete označene poruke?"
-msgstr[2] ""
+msgstr[2] "Da li zaista želite da izbrišete označene poruke?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istorijat razgovora sa %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Poruka greške: %s"
+msgstr "Greška: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
-msgstr "Greška."
+msgstr "Greška"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Isteklo vreme za učitavanje slike"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Niste povezani na server"
+msgstr "Zatvorićete nekoliko jezičaka"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Da li zaista želite da izbrišete označenu poruku?"
+msgstr "Da li zaista želite da ih sve zatvorite?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Grupni razgovori"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- poruke će biti logovane"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti logovane"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je promenio status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s je na vezi"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s je otišao"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova samostalna poruka od kontakta %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privatna poruka sa grupnog razgovora %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/notify.py:555
-#, fuzzy
+#: ../src/notify.py:568
 msgid "Ignore"
-msgstr "_Ignoriši"
+msgstr "Ignoriši"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Dohvatanje profila..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Informacije primljene"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Ako niste na vezi, ne možete objaviti Baše informacije"
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Slanje profila..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Publikacija vCard neuspela"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9246,46 +9218,51 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Autorizacija poslata"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako kontakt \"%s\" prihvati ovaj zahtev, znaćete njegov/njen status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Autorizacija uklonjena"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će Vas kontakt \"%s\" uvek videti kao da niste na vezi."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Povezaćete se na %s bez OpenPGP ključa."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9293,28 +9270,27 @@ msgstr ""
 "Promena Vašeg statusa u Nevidljiv će rezultovati  odvezivanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "desinhronizovan"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Stvarno zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
+msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Uvek zatvori Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9322,16 +9298,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9339,11 +9315,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9352,69 +9328,70 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovih "
 "transporta: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
-"Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
+"Upravo ćete blokirati kontakt. Jeste li sigurni da želite da nastavite?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Kontakt će vas videti kao da niste na vezi i nećete dobijati poruke koje vam "
+"šalje."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno uklonja i sve kontakte iz ove grupe iz liste kontakata"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Pridruži OpenPGP Ključ"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za pridruživanje kontaktu"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" će biti uklonjen sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
-msgstr ""
+msgstr "Upravo ćete ukloniti \"%(name)s\" (%(jid)s) iz vaše liste kontakata.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9423,11 +9400,11 @@ msgstr ""
 "ta osoba uvek videti kao da niste na vezi."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9435,16 +9412,16 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno podrazumevano uklanjate i odobrenje što "
 "znači da će Vas ta osoba uvek videti kao da niste na vezi."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status i nakon uklanjanja"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9454,35 +9431,37 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
+"Upravo ćete poslati prilagođen status. Jeste li sigurni da želite da "
+"nastavite?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Kontakt će vas privremeno videti kao %(status)s, ali samo dok ne promenite "
+"status. Onda će videti globalni status."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate kreirati nalog pre nego što možete da razgovarate sa ostalim "
 "kontaktima."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9490,13 +9469,13 @@ msgstr ""
 "Vaš server ne podržava čuvanje informacija pseudokontakata. Te informacije "
 "neće biti sačuvane pri sledećem povezivanju."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9506,11 +9485,11 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9518,172 +9497,171 @@ msgstr[0] "Da li želite poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Da li želite poslati ove datoteke kontaktu %s:"
 msgstr[2] "Da li želite poslati ove datoteke kontaktu %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Poslate %s"
+msgstr "Pošalji %s za %s"
 
-#: ../src/roster_window.py:4213
-#, fuzzy, python-format
+#: ../src/roster_window.py:4233
+#, python-format
 msgid "Make %s and %s metacontacts"
-msgstr "Šalje datoteku kontaktu"
+msgstr "Napravi metakontakte od %s i %s"
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "na %s nalog"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje _markerima..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "naloga %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "za nalog %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Konfiguriši servise..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Izmeni _grupe"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Pošalji jednu poruku"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Izvrši naredbu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Izloguj se"
+msgstr "U_loguj se ponovo"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Izloguj se"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Promeni statusnu poruku..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Čekam na rezultate"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Greška u primanju forme za podatke"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Potvrdi ove opcije sesije"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9698,7 +9676,7 @@ msgstr ""
 "\n"
 "\tDa li su ove stavke prihvatljive?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9713,116 +9691,116 @@ msgstr ""
 "\n"
 "Nastaviti sa sesijom?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Promeni statusnu poruku..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Džaber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [blokiran]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [umanjen]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslednji status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Na vezi"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Van veze"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Pesma:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Slanje"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Nije počeo"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Zaustavljen"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Završen"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?status prenosa:Pauziran"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Zastoj"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Prenos u toku"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis još nije pružio detaljne informacije"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9830,29 +9808,28 @@ msgstr ""
 "Ovaj servis nije mogao odgovoriti sa detaljnim informacijama.\n"
 "Najverovatnije je zastareo ili u kvaru"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:268
-#, fuzzy
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
-msgstr "?Klijent:Nepoznat"
+msgstr "?Vreme:Nepoznato"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vezanost:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9860,7 +9837,7 @@ msgstr ""
 "Ovaj kontakt je zainteresovan za informacije o Vašem prisustvu, ali Vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu."
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9868,13 +9845,13 @@ msgstr ""
 "Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
 "nju ne zanima Vaše prisustvo"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "I Vi i Vaš kontakt ste zainteresovani za informacije o prisustvu jedan drugog"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9882,18 +9859,72 @@ msgstr ""
 "Ne interesuje Vas prisutnost kontakta, niti Vaša prisutnost interesuje njega/"
 "nju"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Nema zahteva za pretplatom na čekanju."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Dolazna poruka:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Odlazna poruka:"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Host %s koji ste postavili kao ft_add_host_to_send napredno podešavanje "
+#~ "nije ispravan. pa je ignorisan."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Lozinka za OpenPGP nije uneta"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Ako želite nastaviti sa slanjem i primanjem poruka, morate se isključiti "
+#~ "i ponovo doći na vezu."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Niste spojeni ili ste nevidljivi za druge. Vaša poruka ne može biti "
+#~ "poslata."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Ova poruka je šifrovana]"
+
+#~ msgid "%i days ago"
+#~ msgstr "Pre %i dana"
+
+#~ msgid "Trayicon"
+#~ msgstr "Ikona sistemske kasete"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Ikona u sistemskoj kaseti odražava trenutno stanje."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Zahteva python-gnome2-extras ili kompajliranje trayicon modula iz Gajim "
+#~ "izvornog koda."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Zahteva PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Dodaj poseb_no obaveštenje"
 
@@ -9950,7 +9981,7 @@ msgstr " resurs sa prioritetom "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
 #~ "If the JID is currently in the group chat, he/she/it will also be kicked."
 #~ msgstr ""
-#~ "Korišćenje: /%s <nadimak|džid> [razlog], zabranjuje pristup DžID-u u "
+#~ "Korišćenje: /%s <nadimak|džid> [razlog], zabranjuje pristup DŽID-u u "
 #~ "sobu. Nadimak učesnika može biti zamenjen, ali ne i ako sadrži \"@\". Ako "
 #~ "je Džaber ID trenutno u sobi, on/ona će biti izbačen(a). Razmaci u "
 #~ "imenima NISU podržani."
@@ -9972,7 +10003,7 @@ msgstr " resurs sa prioritetom "
 #~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
 #~ "optionally providing a reason."
 #~ msgstr ""
-#~ "Način korišćenja: /%s DžID> [razlog], poziva Džaber ID u trenutni grupni "
+#~ "Način korišćenja: /%s DŽID> [razlog], poziva Džaber ID u trenutni grupni "
 #~ "razgovor, opciono dajući razlog."
 
 #~ msgid ""
diff --git a/po/sv.po b/po/sv.po
index 36e17c92f..2ddb1c622 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-20 00:05+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-10-29 10:21+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -94,7 +94,7 @@ msgstr "<b>Välj en server</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "@"
-msgstr ""
+msgstr "@"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
@@ -105,9 +105,8 @@ msgstr ""
 "SHA1-fingeravtryck för certifikatet:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Använd autentiser_ing för proxyserver"
+msgstr "Anon_ym autentisering"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -282,9 +281,9 @@ msgstr "Redigera personlig information..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -293,9 +292,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Allmänt"
 
@@ -355,21 +354,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Information om dig, som den är sparad på servern"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Ingen"
 
@@ -483,9 +482,8 @@ msgid "Accounts"
 msgstr "Konton"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Använd autentiser_ing för proxyserver"
+msgstr "Anonym autentisering"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -525,8 +523,8 @@ msgstr ""
 "Du kan dock överväga att ändra möjliga brandväggsregler."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -540,7 +538,7 @@ msgid "Mer_ge accounts"
 msgstr "Sa_mmanfoga konton"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Byt _namn"
 
@@ -940,7 +938,7 @@ msgstr "Senast ändrad:"
 msgid "New entry received"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
@@ -984,11 +982,11 @@ msgstr "Ange nytt lösenord:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Ange ditt nya statusmeddelande</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Aktivitet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Humör:"
 
@@ -1078,8 +1076,8 @@ msgstr "Redigera _grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "Bjud _in till"
 
@@ -1092,8 +1090,8 @@ msgid "Remo_ve"
 msgstr "Ta _bort"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Skicka a_npassad status"
 
@@ -1126,8 +1124,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Tillåt henne/honom att se min status"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Blockera"
 
@@ -1138,7 +1136,7 @@ msgstr "_Förbjud henne/honom att se min status"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Historik"
 
@@ -1159,8 +1157,8 @@ msgid "_Subscription"
 msgstr "_Prenumeration"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "A_vblockera"
 
@@ -1249,7 +1247,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "När en filöverföring är färdig så visa en popupnotifiering"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
 msgid "_Continue"
 msgstr "_Fortsätt"
 
@@ -1257,10 +1255,9 @@ msgstr "_Fortsätt"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Meddela mig när en filöverföring är färdig"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
-#, fuzzy
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
-msgstr "_Öppna behållande mapp"
+msgstr "_Öppna mapp"
 
 #: ../data/glade/filetransfers.glade.h:16
 msgid "_Pause"
@@ -1286,7 +1283,7 @@ msgstr ""
 "Kontaktrad\n"
 "Chattbanner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Fet"
 
@@ -1306,11 +1303,11 @@ msgstr "Gajims temaanpassare"
 msgid "Gone"
 msgstr "Borta"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1358,7 +1355,7 @@ msgstr "Byt _ämne..."
 msgid "Configure _Room..."
 msgstr "Konfigurera _rum..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Bokmärk"
 
@@ -1433,15 +1430,11 @@ msgid "Subject"
 msgstr "Ämne"
 
 #: ../data/glade/history_manager.glade.h:1
-#, fuzzy
 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."
 msgstr ""
-"<big><b>Välkommen till Gajims historikhanterare</b></big>\n"
-"\n"
-"Du kan välja loggar till vänster och/eller söka i databasen härunder.\n"
 "<b>VARNING:</b>\n"
 "Se till att Gajim inte är startat om du planerar att radera mycket. Undvik i "
 "regel att radera för kontakter du just nu chattar med."
@@ -1450,8 +1443,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Välkommen till Gajims hanterare för historikloggar</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1481,7 +1475,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Sök i databasen"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Konversationshistorik"
 
@@ -1509,7 +1503,7 @@ msgstr "_Logga konversationshistorik"
 msgid "Bookmark this room"
 msgstr "Bokmärk detta rum (Ctrl+B)"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Gå in i gruppchatt"
 
@@ -1536,8 +1530,8 @@ msgstr "Senaste:"
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "_Gå in i"
 
@@ -1565,7 +1559,7 @@ msgstr "Minimera när du gått in automatiskt"
 msgid "Print status:"
 msgstr "Skriv ut status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Server:"
 
@@ -1676,17 +1670,26 @@ msgid "Show a list of formattings"
 msgstr "Visa en lista över formateringar"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Visa en meny över avancerade funktioner (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Visa kontaktens profil (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Skicka"
 
@@ -1803,7 +1806,7 @@ msgstr ""
 "Detektera vid varje Gajimstart\n"
 "Använd alltid GNOMEs standardprogram\n"
 "Använd alltid KDEs standardprogram\n"
-"Använd alltid XFCE4s standardprogram\n"
+"Använd alltid Xfces standardprogram\n"
 "Anpassa"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1819,6 +1822,16 @@ msgid "Configure color and font of the interface"
 msgstr "Konfigurera färger och typsnitt för gränssnittet"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Chattmeddelande:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Kontaktnamn"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1832,31 +1845,31 @@ msgstr ""
 "Frikopplad kontaktlista med chatt, grupperad efter konto\n"
 "Frikopplad kontaktlista med chatt, grupperad efter typ"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Visa _aktivitet för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Visa _extra e-postdetaljer"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Visa _låtar för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Visa a_vatarer för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Visa _humör för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Visa status_meddelanden för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1866,7 +1879,7 @@ msgstr ""
 "som du har med en kontakt. Här kan du ange vilka chattstatusar som du vill "
 "visa i chattfönster."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1876,7 +1889,7 @@ msgstr ""
 "som du har med en kontakt. Här kan du ange vilka chattstatusar som du vill "
 "skicka till den andra parten."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1884,11 +1897,11 @@ msgstr ""
 "Gajim kommer att notifiera dig via ett popupfönster i nedre högra hörnet av "
 "skärmen om kontakter som just loggat ut"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Dölj alla knappar i chattfönster"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1896,7 +1909,7 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1904,19 +1917,19 @@ msgstr ""
 "Om kryssad kommer Gajim även att inkludera information om avsändaren av den "
 "nya e-posten"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "Om ibockad kommer Gajim också att ha en aktivitetsfältsikon"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1924,7 +1937,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa avatarer för kontakter i kontaktfönster och "
 "gruppchattar"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1932,7 +1945,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa statusmeddelanden för kontakter under "
 "kontaktens namn i kontaktfönster och gruppchattar"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1940,7 +1953,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1948,7 +1961,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1956,14 +1969,14 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1974,14 +1987,14 @@ msgstr ""
 "irriterar dig. Använd med förstånd, för det blockerar alla meddelanden från "
 "alla kontakter som inte finns i ditt register"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -1990,7 +2003,7 @@ msgstr ""
 "Om kryssad kommer Gajim också inkludera information om vem som skickade den "
 "nya e-posten"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2000,13 +2013,13 @@ msgstr ""
 "en kontakt från MSN kommer att ha motsvarade MSN-ikon för tillgänglig, "
 "frånvarande, upptagen, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -2015,19 +2028,19 @@ msgstr ""
 "Om inte avstängd kommer Gajim ersätta ascii-smilies som \":)\" med "
 "motsvarande animerade eller statiska grafiska känsloikoner"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Logga kr_ypterad chattsession"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "_Gör meddelandefönstren kompakta"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Ha_ntera..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
@@ -2037,31 +2050,31 @@ msgstr ""
 "Endast vid väntande händelser\n"
 "Alltid"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Notifiera mig om kontakter som loggar _in"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Notifiera mig om kontakter som loggar _ut"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Notifiera vid ny _Gmail-e-post"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Personliga händelser"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Spela _upp ljud"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2071,23 +2084,23 @@ msgstr ""
 "Notifiera mig om den\n"
 "Visa endast i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
 msgstr "Visa i notifieringsyta:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2095,27 +2108,27 @@ msgstr ""
 "Vissa meddelanden kan innehålla textformatering (formatering, färger etc). "
 "Om kryssad kommer Gajim att endast visa rå meddelandetext."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Sortera kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Status_ikoner:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2123,7 +2136,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2131,103 +2144,105 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Använd _transporternas ikoner"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Använd systemets _standard"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "När ny händelse tas emot:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Felmeddelande: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "För_e smeknamn:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "_Frånvarande efter:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "Visa _notifieringar för chattstatus:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Känsloikoner:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Filhanterare:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorera händelser från kontakter som inte finns i kontaktlistan"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorera textformatering i inkommande meddelanden"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Inkommande meddelande:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Logga statusändringar för kontakter"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_E-postklient:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "_Inte tillgänglig efter:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "_Utgående meddelande:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "_Återställ till standardfärger"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "_Skicka notifieringar för chattstatus:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Statusmeddelande:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "_Fönsterbeteende:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "i _gruppchattar"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "i _kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "minuter"
 
@@ -2280,7 +2295,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Ordning:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Integritetslista"
 
@@ -2424,7 +2439,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Titel:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Roll:</b>"
 
@@ -2484,8 +2499,8 @@ msgstr "Ta bort kontot från Gajim och från _servern"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "Ta _bort"
 
@@ -2494,6 +2509,8 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>någon@någonstans.se</b> vill att du ska <b>lägga till</b> några kontakter "
+"till din kontaktlista."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
@@ -2504,14 +2521,13 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Stäng"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "Stäng"
+msgid "gtk-cancel"
+msgstr "Avbryt"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2568,7 +2584,7 @@ msgstr "_Åtgärder"
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "R_edigera"
 
@@ -2609,11 +2625,11 @@ msgid "_Add contact"
 msgstr "_Lägg till kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Sök"
 
@@ -2633,10 +2649,6 @@ msgstr "Registrera hos"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2844,282 +2856,266 @@ msgstr "Resurs:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Avbryt bekräftelse"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Du håller på att köra ett kommando. Vill du verkligen avbryta det?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Tjänsten returnerade ett fel."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Aktiverad"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Inaktiverad"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Boolesk"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Heltal"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Färg"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Inställningens namn"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Värde"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Dold"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr ""
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] ""
+msgstr[1] ""
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "engelska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "vitryska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "bulgariska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "bretonska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "tjeckiska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "tyska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "grekiska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "brittiska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "spanska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "baskiska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "franska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "kroatiska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "italienska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "norska (bokmål)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "nederländska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "norska (nynorsk)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "polska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "portugisiska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "brasiliansk portugisiska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "ryska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "serbiska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "slovakiska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "svenska"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "kinesiska"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Stavningsspråk"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "En anslutning är inte tillgänglig"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Ditt meddelande kan inte skickas förrän du är ansluten."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 msgid "Underline"
 msgstr "Understruken"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 msgid "Strike"
 msgstr "Genomstruken"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr "Typsnitt"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 msgid "Clear formating"
 msgstr "Ingen formatering"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Verkligen skicka filen?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Om du skickar en fil till %s så kommer han/hon att få veta ditt riktiga "
 "Jabber-ID."
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "GPG-kryptering aktiverad"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Inte i kontaktlista"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "En lista över aktiva, färdigställda och stoppade filöverföringar"
+msgstr "Denna kontakt har inte stöd för filöverföringar."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Okänd artist"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Okänd titel"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Okänd källa"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> av <i>%(artist)s</i>\n"
-"från <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s från gruppchatten %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Ingen GPG-nyckel tilldelad"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3127,50 +3123,50 @@ msgstr ""
 "Ingen GPG-nyckel har tilldelats denna kontakt. Därför kan du inte kryptera "
 "meddelanden med GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "GPG-kryptering inaktiverad"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Sessionen KOMMER att loggas"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Sessionen KOMMER INTE att loggas"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "är"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "är INTE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "kommer"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "kommer INTE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "och autentiserad"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 msgid "and NOT authenticated"
 msgstr "och INTE autentiserad"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3179,23 +3175,23 @@ msgstr ""
 "%(type)s-kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din chattsession %(logged)s att loggas."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Sessionsförhandlingen avbröts"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Denna session är krypterad"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr " och KOMMER att loggas"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr " och KOMMER INTE att loggas"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3203,25 +3199,25 @@ msgstr ""
 "Fjärrkontaktens identitet har inte verifierats. Klicka på sköldknappen för "
 "mer information."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "E2E-kryptering inaktiverad"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Följande meddelande var INTE krypterat"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Följande meddelande var krypterat"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du tog just emot ett meddelande från \"%s\""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3229,15 +3225,15 @@ msgstr ""
 "Om du stänger den här fliken och har historik inaktiverad så kommer "
 "meddelandet att förloras."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Databasfel"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3246,7 +3242,7 @@ msgstr ""
 "Databasfilen (%s) kan inte läsas. Försök att reparera den eller ta bort den "
 "(all historik kommer att förloras)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s är nu %(status)s"
@@ -3255,23 +3251,23 @@ msgstr "%(name)s är nu %(status)s"
 msgid "creating logs database"
 msgstr "skapar loggdatabas"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s är en fil men den borde vara en katalog"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu att avslutas"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s är en katalog men den borde vara en fil"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "skapar katalogen %s"
@@ -3334,10 +3330,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Välj de gruppchattar som du vill lämna"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Gruppchattar"
 
@@ -3445,9 +3441,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "standard"
 
@@ -4057,7 +4053,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Temporär lösning för Jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4065,25 +4061,25 @@ msgstr ""
 "Om kryssad så kommer Gajim att använda ditt IP och proxyservrar definerade i "
 "alternativet file_transfer_proxies för filöverföringar."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Är OpenPGP aktiverat för denna kontakt?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4091,101 +4087,101 @@ msgstr ""
 "Ska Gajim automatiskt starta en krypterad session med denna kontakt om "
 "möjligt?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Språket för vilket vi vill leta efter felstavade ord"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "alla eller mellanslagsseparerad status"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "\"yes\", \"no\" eller \"both\""
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "\"yes\", \"no\" eller \"\""
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, lämna ett meddelande."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Jag är tillgänglig."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Jag är ledig för chatt."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Strax tillbaka."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Jag är inte tillgänglig."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Stör inte."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Hejdå!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4194,59 +4190,58 @@ msgstr ""
 "Ljud att spela när MUC-meddelande innehåller ett av orden i "
 "muc_highlight_words, eller när MUC-meddelande innehåller ditt smeknamn."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ljud att spela upp när ett MUC-meddelande anländer."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Kunde inte läsa in idle-modul"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Fel värd"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Ogiltig lokal adress? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registreringsinformation för transporten %s har inte kommit fram i tid"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
 msgstr "Registreringen lyckades"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s lyckades"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4254,39 +4249,39 @@ msgstr ""
 "Registrering med agenten %(agent)s misslyckades med fel %(error)s: %"
 "(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Osynlighet stöds inte"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Kontot %s saknar stöd för osynlighet."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4296,7 +4291,7 @@ msgstr ""
 "gajim.org/wiki/DatabaseBackup) eller ta bort den (alla historik kommer att "
 "förloras)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Smeknamnet tillåts inte: %s"
@@ -4304,78 +4299,78 @@ msgstr "Smeknamnet tillåts inte: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du är bannlyst från gruppchatten %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppchatten %s finns inte."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Möjligheten att skapa rum är begränsad."
 
-#: ../src/common/connection_handlers.py:2316
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2307
+#, python-format
 msgid "Your registered nickname must be used in group chat %s."
-msgstr "Ditt registrerade smeknamn måste användas."
+msgstr "Ditt registrerade smeknamn måste användas i gruppchatten %s."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du är inte med i medlemslistan i gruppchatten %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan gå in i detta rum istället: %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi prenumererar nu på %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "avprenumerationsförfrågan från %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi prenumererar inte längre på %s"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4513,79 +4508,108 @@ msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr ""
+"Det gick inte att skicka ett meddelande till %s, denna JID är inte giltig."
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Detta meddelande är *krypterat* (Se :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Ämne: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Återanslut manuellt."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Servern %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Servern %s tillhandahöll ett annat registreringsformulär"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Okänt SSL-fel: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din anslutning eller försök igen senare."
 
-#: ../src/common/connection.py:642
-#, fuzzy, python-format
+#: ../src/common/connection.py:1081
+#, python-format
 msgid "Server replied: %s"
-msgstr "Sparad i: %s"
+msgstr "Servern svarade: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunde inte ansluta till kontot %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Anslutningen med kontot \"%s\" har förlorats. Försök att ansluta igen."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4594,7 +4618,7 @@ msgstr ""
 "\n"
 "SSL-fel: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4603,103 +4627,72 @@ msgstr ""
 "\n"
 "Okänt SSL-fel: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din anslutning eller försök igen senare"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering mot \"%s\" misslyckades"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Kontrollera ditt inloggningsnamn och lösenord."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "problem vid sändning %s ( %s )"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Det är inte möjligt att skicka tomma filer"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Detta meddelande är *krypterat* (Se :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Ämne: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Skickade kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Bjud in _kontakter"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Inte hämtad på grund av osynlig status"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 "Registrering med agenten %(agent)s misslyckades med fel %(error)s: %"
 "(error_msg)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Observerande"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Inte i kontaktlista"
 
@@ -4945,7 +4938,7 @@ msgstr "Ledig för chatt"
 msgid "_Available"
 msgstr "_Tillgänglig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Tillgänglig"
 
@@ -5064,77 +5057,77 @@ msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d meddelande väntar"
 msgstr[1] "%d meddelanden väntar"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " från rummet %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " från användaren %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " från %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d väntande händelse"
 msgstr[1] "%d väntande händelser"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5150,16 +5143,16 @@ msgid "%s is not a valid loglevel"
 msgstr "%s är inte en giltig loggnivå"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "migrerar loggdatabas till index"
 
@@ -5168,637 +5161,658 @@ msgstr "migrerar loggdatabas till index"
 msgid "XMPP account %s@%s"
 msgstr "XMPP-kontot %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Rädd"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Förvånad"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Kärleksfull"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Arg"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Irriterad"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Ängslig"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Intresserad"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Skamsen"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Uttråkad"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Modig"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Lugn"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Försiktig"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Kall"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Självsäker"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Förvirrad"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Kontemplativ"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Utmanad"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Excentrisk"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Galen"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Kreativ"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Nyfiken"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Bedrövad"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Deprimerad"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Besviken"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Äcklad"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Förskräckt"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Distraherad"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Besvärad"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Avundsjuk"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Upphetsad"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Flirtig"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Frustrerad"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Tacksam"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Sörjer"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Grinig"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Glad"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Hoppfull"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Het"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Spak"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Förödmjukad"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Hungrig"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Sårad"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Imponerad"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Respektfull"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Kär"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Upprörd"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Intresserad"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Berusad"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Oövervinnelig"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Avundsjuk"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Ensam"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Förlorad"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Lycklig"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Elak"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Lynnig"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Nervös"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Förolämpad"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Rasande"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Lekfull"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Stolt"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Avslappnad"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Lättad"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Ångerfull"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Rastlös"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Ledsen"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Nöjd"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Seriös"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Chockad"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Blyg"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Sjuk"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Sömning"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Stressad"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Stark"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Överraskad"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Tacksam"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Törstig"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Trött"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Svag"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Bekymrad"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Fel Lösenfras"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Handlar mat"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Städar"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Lagar mat"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Reparerar"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Diskar"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Tvättar"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Arbetar i trädgården"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "Springer ett ärende"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Ute och går med hunden"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Dricker"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "Tar en öl"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "Dricker kaffe"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "Dricker te"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Tar ett mellanmål"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Äter frukost"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Äter middag"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Äter lunch"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Tränar"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Cyklar"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Dansar"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "Sparkar %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Joggar"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Sportar"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Springer"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Åker skidor"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Simmar"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Tränar"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Grooming"
 msgstr "Från"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "Njuter på ett spa"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Borstar tänderna"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Är hos frissan"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Rakar sig"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Tar ett bad"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Tar en dusch"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "I ett möte"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Har en ledig dag"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Hänger"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Gömmer sig"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "På semester"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Ber"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Planerad ledighet"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Tänker"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Slappar"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Fiskar"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Spelar"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Går ut"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Festar"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Läser"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Pluggar"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Handlar"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Röker"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Minglar"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Solar"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Ser på tv"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Ser en film"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Pratar"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "I verkliga livet"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Pratar i telefon"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "I ett videosamtal"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Reser"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Pendlar"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Kör bil"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "I en bil"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "På en buss"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "På ett flygplan"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "På ett tåg"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "På resa"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Promenerar"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Programmerar"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "I ett möte"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Studerar"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Skriver"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Okänd artist"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Okänd titel"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Okänd källa"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> av <i>%(artist)s</i>\n"
+"från <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5821,36 +5835,11 @@ msgstr ""
 "[Detta är en del av en krypterad session. Om du ser detta meddelande så har "
 "någonting gått fel.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Värden %s som du konfigurerade som det avancerade alternativet "
-"ft_add_hosts_to_send är inte giltig, därför ignoreras den."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Lösenordsfras för OpenPGP angavs inte"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du kommer ansluta till %s utan OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "För att fortsätta skicka och ta emot meddelanden måste du återansluta."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahifel"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5859,53 +5848,44 @@ msgstr ""
 "%s\n"
 "Link-local-meddelanden kanske inte fungerar korrekt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Kunde inte starta lokal tjänst"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Kunde inte binda till port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontrollera om avahi-daemon körs."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunde inte ändra status för kontot \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Du är inte ansluten eller visas inte för andra. Ditt meddelande kunde inte "
-"skickas."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Det här meddelandet är krypterat]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Ditt meddelande kunde inte skickas."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten är nerkopplad. Ditt meddelande kunde inte skickas."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5917,24 +5897,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fel när tjänsten lades till. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Standardmeddelande"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbok för språket %s inte tillgängligt"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5943,213 +5923,213 @@ msgstr ""
 "Du måste installera %s ordboken för att använda stavningskontroll, eller "
 "välj ett annat språk genom att sätta valet speller_language"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Återanslut nu?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Om du vill att ändringarna skall ske omedelbart måste du återansluta."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP är inte användbar på den här datorn"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Olästa händelser"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "Läs alla väntande händelser innan du tar bort detta konto."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har öppnat chatt i kontot %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alla chatts- och gruppchattsfönster kommer stängas. Vill du fortsätta?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "För att ändra kontonamnet måste du läsa alla väntande händelser."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Kontonamn används redan"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Byt namn på konto"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Ange ett nytt namn för kontot %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ett Jabber-ID måste vara av formen \"användare@servernamn\"."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Du måste skapa ditt konto innan du redigerar din personliga information."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan inte redigera din personliga information utan en anslutning."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Din server saknar stöd för Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Din server kan inte spara din personliga information."
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Kontot Local används redan."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Byt namn eller ta bort det innan du aktiverar link-local-meddelanden."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Bannlista"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Ägarlista"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Administratörslista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6157,11 +6137,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6169,11 +6149,11 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6181,11 +6161,11 @@ msgstr ""
 "<b>Vem vill du göra till ägare?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Lägger till administratör..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6193,8 +6173,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
-#, fuzzy
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6204,64 +6183,65 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 "Kan vara en av följande:\n"
-"1. användare@domän/resurs (endast den resursen matchar)\n"
-"2. användare@domän (alla resurser matchar)\n"
-"3. domän/resurs (endast den resursen matchar)\n"
+"1. användare@domän/resurs (endast den resursen matchar).\n"
+"2. användare@domän (alla resurser matchar).\n"
+"3. domän/resurs (endast den resursen matchar).\n"
 "4. domän (domänen i sig matchar, så gör även alla användare@domän,\n"
-"domän/resurs, eller adress som innehåller en underdomän."
+"domän/resurs eller adress som innehåller en underdomän)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Ange ditt lösenord för kontot %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:Alla"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "In- och utgång enbart"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Ny gruppchatt"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6269,29 +6249,27 @@ msgstr ""
 "bokmärket."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Smeknamnet tillåts inte: %s"
+msgstr "Tecknet tillåts inte"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Ogiltig server"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Ogiltig post"
+msgstr "Ogiltigt rum"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Kontot har lagts till"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6301,32 +6279,33 @@ msgstr ""
 "Du kan ställa in avancerade alternativ genom att trycka på \"Avancerat\", "
 "eller senare genom att använda \"Redigera->Konton\" från huvudfönstret."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "Du behöver ange ett användarnamn för att konfigurera detta konto."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr "Ange en server på vilken du vill registrera."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Certifikatet finns redan i filen"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
+"Detta certifikat finns redan i filen %s så det har inte lagts till igen."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6341,7 +6320,7 @@ msgstr ""
 "SSL-fel: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6352,293 +6331,287 @@ msgstr ""
 "SHA1-fingeravtryck för certifikatet:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skapades"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Första meddelandet mottaget"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Nästa meddelande blev fokuserat"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Nästa meddelande blev ofokuserat"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Kontakt loggade in"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Kontakt loggade ut"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Meddelande skickat"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Meddelande mottaget i gruppchatt"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "E-post mottaget på GMail"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
-#, fuzzy
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
-"Texten under denna linje är vad som har sagts sedan du senast hade fokus på "
-"denna gruppchatt"
+"Texten under denna linje är vad som har sagts\n"
+"sedan du senast hade fokus på denna gruppchatt"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "A_vsluta"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL för uppslagsbok saknar ett \"%s\" och det är inte en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Öppna som _länk"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Igår"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i dagar sen"
+msgid_plural "%i days ago"
+msgstr[0] "Igår"
+msgstr[1] "Igår"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Jabber-ID finns redan i listan"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens namn: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Grupp"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "Nyckel-ID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Kontaktnamn"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Ange humör"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Statusmeddelande för %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Skriv över statusmeddelande?"
 
-#: ../src/dialogs.py:773
-#, fuzzy
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
-msgstr ""
-"Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
+msgstr "Detta namn används redan. Vill du skriva över detta statusmeddelande?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Spara som Valbart Statusmeddelande"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Ange ett namn för detta statusmeddelande"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM-adress:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG-nummer:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ-nummer:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN-adress:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo!-adress:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyll i informationen om kontakten du vill lägga till i konto %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyll i informationen om kontakten du vill lägga till"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan inte lägga till dig själv i din kontaktlista."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i kontaktlistan"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Denna kontakt finns redan i din kontaktlista."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Användar-id:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ version:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK version:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Nuvarande utvecklare:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Sist men inte minst vill vi tacka alla anvsraiga paketerare."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -6648,7 +6621,7 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6661,100 +6634,104 @@ msgstr ""
 "\n"
 "Markeringsfunktionen för felstavade ord kommer inte att användas"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "Smeknamnet innehåller icke-tillåtna tecken."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Prenumerationsbegäran för kontot %(account)s från %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du är redan i gruppchatten %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Konto från vilket du vill gå in i rummet"
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Det här är ingen gruppchatt"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s är inte namnet på en gruppchatt."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Detta konto är inte anslutet till servern"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan inte synkronisera med ett konto utan att vara ansluten."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6763,301 +6740,326 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "Anslutningen är inte tillgänglig"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Ogiltigt JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kunde inte tolka \"%s\"."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan inte ändra ditt lösenord utan en anslutning."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Kontakten loggade in"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Kontakten ändrade status"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Ett meddelande med kontot %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Ett meddelande i kontot %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Från %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "XML-konsol"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
-#, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Jag vill lägga till dig i min kontaktlista."
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Ledsen"
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#: ../src/dialogs.py:2958
 #, fuzzy
-msgid "Add"
-msgstr "Adress"
+msgid "modify"
+msgstr "Ändra"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#: ../src/dialogs.py:2959
 #, fuzzy
+msgid "remove"
+msgstr "Ta _bort"
+
+#: ../src/dialogs.py:2987
+#, fuzzy, python-format
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> vill att du <b>%s</b> några kontakter i din kontaktlista."
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+msgid "Add"
+msgstr "Lägg till"
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Lynnig"
+msgstr "Ändra"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
-msgstr "Jabber-ID:"
+msgstr "Jabber-ID"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Grupp"
+msgstr "Grupper"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
+msgstr "%s föreslog att lägga till dig i min kontaktlista."
+
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "_Lägg till kontakt"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Ta bort en kontakt från kontaktlista"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privat identitetslista <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privat integritetslista för %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ordning: %(order)s, åtgärd: %(action)s, typ: %(type)s, värde: %(value)s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordning: %(order)s, åtgärd: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redigera en regel</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Lägg till en regel</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privata integritetslistor för %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Integritetslistor"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Ogiltigt listnamn"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Du måste ange ett namn för att skapa en integritetslista."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har bjudit in dig till en diskussion"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har bjudit in dig till gruppchatten %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Vill du acceptera inbjudan?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Villkor"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "när jag är "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7068,38 +7070,38 @@ msgstr ""
 "\n"
 "Denna sessions Short Authentication String är <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Du har redan verifierat identiteten för denna kontakt."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet är verifierad"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Verifiera igen..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet är INTE verifierad"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Verifiera..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifierat kontaktens identitet?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7109,31 +7111,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Andra"
@@ -7143,24 +7164,24 @@ msgstr "Andra"
 msgid "Conference"
 msgstr "Konferens"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "Du kan inte bläddra bland tillgängliga tjänster utan en anslutning"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7168,331 +7189,332 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Denna typ av tjänst innehåller inga objekt att bläddra genom."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bläddrar i %(address)s med kontot %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Denna tjänst innehåller inga objekt att bläddra genom."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "_Kör kommando"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Söker av %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Användare"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Beskrivning"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Bokmärke finns redan"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Bokmärket har lagts till"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i din kontaktlista."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Nod"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "Säg _upp prenumeration"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr "Validering av SSL-certifikat"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
+"Ett bibliotek som används för att validera servercertifikat för att försäkra "
+"en säker anslutning."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Kräver python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Kräver python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Kräver pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 msgid "Command line"
 msgstr "Kommandorad"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Ett skript för att styra Gajim via kommandraden."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Kräver python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Funktionen är inte tillgänglig under Windows."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
 msgstr "OpenPGP-meddelandekryptering"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Krypterar chattmeddelanden med gpg-nycklar."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Kräver gpg och python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Automatisk detektering av nätverksstatus."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Kräver gnome-network-manager och python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Sessionshantering"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim-sessionen lagras vid utloggning och återskapas vid inloggning."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Kräver python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 msgid "Password encryption"
 msgstr "Lösenordskryptering"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lösenord kan lagras säkert och inte bara i klartext."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Kräver gnome-keyring och python-gnome2-desktop."
+msgstr "Kräver gnome-keyring och python-gnome2-desktop, eller kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Möjlighet att ansluta till servrar som använder SRV-poster."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Kräver dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Kräver nslookup för att använda SRV-poster."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Stavningskontroll"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Stavningskontrollerar meddelanden."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr "Kräver libgtkspell."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 msgid "Notification"
 msgstr "Notifiering"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 "Kräver python-notify eller python-dbus i kombination med notification-daemon."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Aktivitetsikon"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "En ikon i aktivitetsfältet som beskriver aktuell närvaro."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Kräver python-gnome2-extras eller kompilerad trayicon-modul från Gajims "
-"källkod."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Kräver PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatisk status"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr "Kräver libxss-biblioteket."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr "Kräver python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformera LaTeX-uttryck mellan $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
+"Kräver texlive-latex-base och dvipng. Du måste ställa in \"use_latex\" till "
+"True i avancerad konfiguration."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
+"Kräver texlive-latex-base och dvipng (Allt finns i MikTeX). Du måste ställa "
+"in \"use_latex\" till True i avancerad konfiguration."
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "OpenPGP-kryptering"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Krypterar chattmeddelanden."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Kräver python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "RST-generator"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
+"Generera XHTML-utdata från RST-kod (se http://docutils.sourceforge.net/docs/"
+"ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Kräver python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr "Banners och klickbara länkar"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Kräver python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Kräver python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Funktion"
 
@@ -7508,107 +7530,106 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Förlopp"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnamn: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Storlek: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Mottagare: "
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sparad i: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Filöverföring färdig"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Filöverföringen avbruten"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Anslutning med motpart kan inte etableras."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottagare: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Felmeddelande: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
-msgstr "Filöverföring Stoppad"
+msgstr "Filöverföringen stoppad"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Välj fil att skicka..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Beskrivning: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan inte komma åt denna fil"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Denna fil används av en annan process."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan inte skriva över befintliga filen \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7616,33 +7637,33 @@ msgstr ""
 "En fil med det här namnet existerar redan och du har inte rättigheter att "
 "skriva över den."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "What do you want to do?"
 msgstr "Vad vill du göra?"
 
 #. 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" är inte skrivbar"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har inte rättigheter att skapa filer i den här katalogen."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 msgid "Save File as..."
 msgstr "Spara fil som..."
 
 #. 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7650,32 +7671,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Ogiltig Fil"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Sändare: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Paus"
 
@@ -7689,24 +7710,20 @@ msgid "importing PyGTK failed: %s"
 msgstr ""
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim behöver PyGTK 2.8 eller senare"
+msgstr "Gajim behöver PyGTK 2.12 eller senare"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim behöver PyGTK 2.8 eller senare för att köra. Avbryter..."
+msgstr "Gajim behöver PyGTK 2.12 eller senare för att köra. Avbryter..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim behöver GTK 2.8 eller senare"
+msgstr "Gajim behöver GTK 2.12 eller senare"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim behöver GTK 2.8 eller senare för att köra. Avbryter..."
+msgstr "Gajim behöver GTK 2.12 eller senare för att köra. Avbryter..."
 
 #: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
@@ -7743,11 +7760,11 @@ msgstr ""
 "Kontrollera att Pywin32 är installerat på ditt system. Du kan hämta det på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim körs redan"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7755,455 +7772,29 @@ msgstr ""
 "En annan instans of Gajim verkar redan vara igång\n"
 "Starta ändå?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Lösenfras krävs"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr ""
-"Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
-
-#: ../src/gajim.py:455
-#, fuzzy
-msgid "GPG key expired"
-msgstr "Ingen GPG-nyckel tilldelad"
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "Du kommer ansluta till %s utan OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Felaktig lösenfras"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Ditt önskade smeknamn i gruppchatten %s används redan eller är registrerat "
-"av\n"
-"en annan deltagare. Ange ett annat smeknamn nedan:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Accepterar du den här förfrågan?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Accepterar du den här begäran på kontot %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s)-auktorisering för %(url)s (id: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Anslutningsfel"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Fel %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "fel vid sändning av %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "Prenumerationsbegäran"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Auktorisering accepterad"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Du kommer alltid att se honom eller henne som frånkopplad.\n"
-"Vill du ta bort honom eller henne från din kontaktlista?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Säg _upp prenumeration"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt med \"%s\" kan inte etableras"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s är nu känd som %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s är nu %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s har ställt in ämnet till %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Rummet visar nu otillgängliga medlemmar"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "rummet visar nu inga otillgängliga medlemmar"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Rumsloggning är nu aktiverad"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Rumsloggning är nu inaktiverad"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Ett lösenord krävs för att gå in i rummet %s. Ange lösenordet."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Du har konfigurerat Gajim till att använda GPG-agent, men det finns ingen "
-"GPG-agent igång eller så returnerade den en felaktig lösenfras.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Din lösenfras är inkorrekt."
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Din lösenfras är inkorrekt."
-
-#: ../src/gajim.py:1559
-#, fuzzy
-msgid "GPG key not trusted"
-msgstr "GPG är inte användbar"
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Fråga mig i_nte igen"
-
-#: ../src/gajim.py:1571
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring är installerad men inte \t\t\t\t\t\t\tkorrekt startad "
-"(miljövariabeln är förmodligen inte \t\t\t\t\t\t\tkorrekt inställd)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Ny e-post på %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Du har %d ny e-postkonversation"
-msgstr[1] "Du har %d nya e-postkonversationer"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Från: %(from_address)s\n"
-"Ämne: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s vill skicka en fil till dig."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Ta bort en kontakt från kontaktlista"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Fel vid läsning av fil:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "%(filename)s har mattagits från %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Överföringen av %(filename)s från %(name)s har stannat."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "%(filename)s har skickats till %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Överföringen av %(filename)s till %(name)s har stannat."
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Kunde inte dekryptera meddelande"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Användarnamn-konflikt"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "Ange ett nytt användarnamn för ditt lokala konto"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Fel."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Resurskonflikt"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr "Du är redan ansluten till detta konto med samma resurs. Ange en annan"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Fel vid verifiering av SSL-certifikat"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Det uppstod ett fel vid verifiering av SSL-certifikatet på din jabber-"
-"server: %(error)s\n"
-"Vill du fortfarande ansluta till denna server?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ignorera detta fel med certifikatet."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "SSL-certifikatfel"
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-"Det verkar som om SSL-certifikatet för kontot %(account)s har ändrats eller "
-"att din anslutning har komprometterats.\n"
-"Gammalt fingeravtryck: %(old)s\n"
-"Nytt fingeravtryck: %(new)s\n"
-"\n"
-"Vill du fortfarande ansluta och uppdatera fingeravtrycket för certifikatet?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Osäker anslutning"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Du är på väg att skicka ditt lösenord över en okrypterad anslutning. Är du "
-"säker på att du vill göra det?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Du är på väg att skicka ditt lösenord över en osäker anslutning. Du bör "
-"installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
-"skicka lösenordet?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Känsloikoner inaktiverade"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Du kan inte gå in i en gruppchatt när du är osynlig"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Kunde inte spara dina inställningar"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Visar hjälp för ett specifikt kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "visar hjälp för kommando"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Visar eller döljer kontaktlistan"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Öppnar ett fönster med nästa olästa meddelande"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8211,49 +7802,49 @@ msgstr ""
 "Skriver ut en lista över alla kontakter i kontaktlistan. Varje kontakt "
 "hamnar på en egen rad"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "visa bara kontakter för det givna kontot"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Skriver ut en lista över registrerade konton"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Ändrar status för konto eller konton"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "meddelande"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statusmeddelande"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8261,22 +7852,22 @@ msgstr ""
 "ändra status för kontot \"konto\". Om inte angivet, försök ändra status på "
 "alla konton som har alternativet \"synkronisera med global status\" inställt"
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "Ändrar status för konto eller konton"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "Priori_tet:"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Jag vill _registrera ett nytt konto"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -8285,24 +7876,24 @@ msgstr ""
 "ändra status för kontot \"konto\". Om inte angivet, försök ändra status på "
 "alla konton som har alternativet \"synkronisera med global status\" inställt"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Visa chattdialogen så att du kan skicka meddelanden till en kontakt"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID för kontakten som du vill chatta med"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "om specificerat tas kontakten bort från kontaktlistan för det här kontot"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8313,30 +7904,30 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "meddelandeinnehåll"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp-nyckel"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "om specificerat kommer meddelandet bli krypterat med den här publika nyckeln"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "om specificerat kommer meddelandet bli skickat genom det här kontot"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8347,137 +7938,137 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "ämne"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "meddelandeämne"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Skickar nytt meddelande till en gruppchatt som du gått in i."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID för rummet som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Hämta detaljerad information om kontakt"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID för kontakten"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Hämtar detaljerad information för kontakt"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Namn för kontot"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Skicka fil till en kontakt"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Sökväg"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "om specificerat kommer filen bli skickad genom det här kontot"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Listar alla inställningar och deras värden"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "\"nyckel\" är namnet på inställningen, \"värde\" är värdet att sätta den till"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Tar bort en inställning"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "nyckel"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "namnet på inställningen som skall tas bort"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Lägger till en kontakt till kontaktlistan"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Lägger till ny kontakt till detta kontot"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande status (global status om inget konto specificerats)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande statusmeddelande (det globala om inget konto "
 "specificerats)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Returnerar antalet olästa meddelanden"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öppnar \"Starta chatt\" dialogen"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Startar chatt, med detta kontot"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Skickar anpassad XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML att skicka"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8485,72 +8076,71 @@ msgstr ""
 "Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
 "skickas till alla konton"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Hantera en xmpp:/ URI"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "URI att hantera"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Konto i vilket du vill hanterare den"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "meddelandeinnehåll"
+msgstr "Meddelandeinnehåll"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Gå in i ett MUC-rum"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "Rummets JID"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "smeknamn"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Smeknamn att använda"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "lösenord"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Lösenord för att gå in i rummet"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Konto från vilket du vill gå in i rummet"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Kontrollera om Gajim är igång"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Visar eller döljer ipython-fönstret"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8559,17 +8149,17 @@ msgstr ""
 "\"%s\" finns inte i din kontaktlista.\n"
 "Ange konto för att skicka meddelandet."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Det verkar som om Gajim inte är igång. Därför kan du inte använda gajim-"
 "remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8578,16 +8168,16 @@ msgstr ""
 "Användning: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8596,7 +8186,7 @@ msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8605,7 +8195,7 @@ msgstr ""
 "För många argument. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer information"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8614,10 +8204,9 @@ msgstr ""
 "Argumentet \"%(arg)s\" är inte angivet. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer info"
 
-#: ../src/gajim-remote.py:517
-#, fuzzy
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
-msgstr "Fel Lösenfras"
+msgstr "Felaktig uri"
 
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
@@ -8644,174 +8233,198 @@ msgstr "Du kan inte ta bort ditt nuvarande tema"
 msgid "Please first choose another for your current theme."
 msgstr "Välj först ett annat för ditt aktuella tema."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du är inte längre i gruppchatten \"%(room)s\" eller \"%(nick)s\" har lämnat."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Infoga smeknamn"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Konversation med "
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Fortsatt konversation"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Rumsloggning är aktiverad"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Ett nytt rum har skapats"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Servern har tilldelat eller ändrat ditt rumsnamn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s är nu känd som %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Anknytning: "
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "rumskonfigurationen har ändrats till members-only"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
-msgstr ""
+msgstr "systemet stängs av"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s är nu %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Är du säker på att du vill lämna gruppchatten \"%s\"?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Du kommer att bli frånkopplad från denna gruppchatt om du stänger detta "
 "fönster."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Fråga mig i_nte igen"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Förstör %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -8837,58 +8450,473 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Fel vid parsning av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Kunde inte skriva till %s. Session Management-stöd kommer inte att fungera"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim är inte standardklient för Jabber"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Vill du göra Gajim till standardklient för Jabber?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Kontrollera vid start om Gajim är standardklient för Jabber"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Utökning stöds inte"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Bilden kan inte sparas i %(type)s format. Spara som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ditt önskade smeknamn i gruppchatten %s används redan eller är registrerat "
+"av\n"
+"en annan deltagare. Ange ett annat smeknamn nedan:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Använd alltid detta smeknamn när det finns en konflikt"
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Accepterar du den här förfrågan?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Accepterar du den här begäran på kontot %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s)-auktorisering för %(url)s (id: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Anslutningsfel"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Fel %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "fel vid sändning av %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Prenumerationsbegäran"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Auktorisering accepterad"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Du kommer alltid att se honom eller henne som frånkopplad.\n"
+"Vill du ta bort honom eller henne från din kontaktlista?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Säg _upp prenumeration"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt med \"%s\" kan inte etableras"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s har ställt in ämnet till %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Rummet visar nu otillgängliga medlemmar"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "rummet visar nu inga otillgängliga medlemmar"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Rumsloggning är nu aktiverad"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Rumsloggning är nu inaktiverad"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Rummet är nu icke-anonymt"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Rummet är nu semi-anonymt"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Rummet är nu fullständigt anonymt"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Ett lösenord krävs för att gå in i rummet %s. Ange lösenordet."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Du har konfigurerat Gajim till att använda GPG-agent, men det finns ingen "
+"GPG-agent igång eller så returnerade den en felaktig lösenfras.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Din lösenfras är inkorrekt."
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Din lösenfras är inkorrekt."
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG-nyckeln är inte pålitlig"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"GPG-nyckeln som används för att kryptera denna chatt är inte pålitlig. Vill "
+"du verkligen kryptera detta meddelande?"
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome-nyckelring är installerat men inte \t\t\t\tkorrekt startad "
+"(miljövariabeln är förmodligen inte \t\t\t\tkorrekt inställd)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ny e-post på %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Du har %d ny e-postkonversation"
+msgstr[1] "Du har %d nya e-postkonversationer"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Från: %(from_address)s\n"
+"Ämne: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vill skicka en fil till dig."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Fjärrkontakten stoppade överföringen"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Fel vid öppnande av filen"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "%(filename)s har mattagits från %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Överföringen av %(filename)s från %(name)s har stannat."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "%(filename)s har skickats till %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Överföringen av %(filename)s till %(name)s har stannat."
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Kunde inte dekryptera meddelande från %s\n"
+"Det kan ha manipulerats."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Kunde inte dekryptera meddelande"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Användarnamn-konflikt"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "Ange ett nytt användarnamn för ditt lokala konto"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Fel."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Resurskonflikt"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr "Du är redan ansluten till detta konto med samma resurs. Ange en annan"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s vill skicka en fil till dig."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Förfrågan om Filöverföring"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Fel vid verifiering av SSL-certifikat"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Det uppstod ett fel vid verifiering av SSL-certifikatet på din jabber-"
+"server: %(error)s\n"
+"Vill du fortfarande ansluta till denna server?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ignorera detta fel med certifikatet."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "SSL-certifikatfel"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Det verkar som om SSL-certifikatet för kontot %(account)s har ändrats eller "
+"att din anslutning har komprometterats.\n"
+"Gammalt fingeravtryck: %(old)s\n"
+"Nytt fingeravtryck: %(new)s\n"
+"\n"
+"Vill du fortfarande ansluta och uppdatera fingeravtrycket för certifikatet?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Osäker anslutning"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Du är på väg att skicka ditt lösenord över en okrypterad anslutning. Är du "
+"säker på att du vill göra det?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Du är på väg att skicka ditt lösenord över en osäker anslutning. Du bör "
+"installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
+"skicka lösenordet?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "PEP-noden togs inte bort"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP-noden %(node)s blev inte borttagen: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Känsloikoner inaktiverade"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Ditt konfigurerade känsloikontema hittades inte så känsloikoner har "
+"inaktiverats."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Ditt konfigurerade känsloikontema kan inte läsas in. Du kanske måste "
+"uppdatera formatet för filen emoticons.py. Se http://trac.gajim.org/wiki/"
+"Emoticons för mer information."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Du kan inte gå in i en gruppchatt när du är osynlig"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Kunde inte spara dina inställningar"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Lösenfras krävs"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr ""
+"Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "GPG-nyckeln har gått ut"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "Din GPG-nyckel har gått ut. Du kommer anslutas till %s utan OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Felaktig lösenfras"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Ny gruppchatt"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista"
 
@@ -8903,7 +8931,7 @@ msgstr "Kontakter"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Datum"
 
@@ -8914,7 +8942,7 @@ msgstr "Smeknamn"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Meddelande"
 
@@ -8938,191 +8966,189 @@ msgstr ""
 "\n"
 "Om du väljer JA, vänta..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Exporterar Loggar..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Vill du verkligen ta bort loggar för den valda kontakten?"
 msgstr[1] "Vill du verkligen ta bort loggar för de valda kontakterna?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Denna operation kan inte göras ogjord."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort det valda meddelandena?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversationshistorik med %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Diskfel"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s är nu %(status)s:%(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Felmeddelande: %s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 #, fuzzy
 msgid "Error"
 msgstr "Fel."
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status är nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Bild är för stor"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Du är inte ansluten till servern"
+msgstr "Du är på väg att stänga flera flikar"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Vill du verkligen ta bort det valda meddelandet?"
+msgstr "Vill du verkligen stänga alla dem?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Chattar"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Gruppchatt"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- meddelanden kommer att loggas"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- meddelanden kommer inte att loggas"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ändrade status"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s loggade in"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s loggade ut"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nytt privat meddelande från gruppchatten %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Skickat av %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Hämtar profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Filen är tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Kunde inte läsa in bild"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Information togs emot"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Du kan inte publicera din kontaktinformation utan en anslutning."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Skickar profil..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Informationen INTE publicerad"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "publicering av vCard misslyckades"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9130,48 +9156,53 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, försök "
 "igen senare."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Om \"%s\" accepterar din förfrågan kommer du att känna till hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG är inte användbar"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du kommer ansluta till %s utan OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9179,59 +9210,56 @@ msgstr ""
 "Om du byter status till osynlig kommer du att förlora anslutningen till "
 "gruppchatterna. Är du säker på att du vill byta status till osynlig?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "inte i synk"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Verkligen avsluta Gajim?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Är du säker på att du vill lämna rummet \"%s\"?"
+msgstr "Är du säker på att du vill avsluta Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Stäng alltid Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:2351
-#, fuzzy
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr ""
-"Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
-"historik påslagen."
+"Meddelanden kommer endast vara tillgängliga för läsning senare om du har "
+"historik aktiverat och kontakten finns i din kontaktlista."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Du måste läsa dem innan du tar bort denna transport."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:2592
-#, fuzzy
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
-"från denna transport."
+"med denna transport."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Transporter kommer att tas bort"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9240,71 +9268,70 @@ msgstr ""
 "Du kommer inte längre att kunna ta emot eller skicka meddelanden till "
 "kontakter från dessa transporter: %s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Byt namn på kontakt"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Ange ett nytt smeknamn för kontakten %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Byt namn på grupp"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Ange ett nytt namn för gruppen %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vill du ta bort gruppen %s från kontaktlistan?"
 
-#: ../src/roster_window.py:2800
-#, fuzzy
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
-msgstr "Ta bort en kontakt från register"
+msgstr "Ta även bort alla kontakter i denna grupp från din kontaktlista"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" kommer att tas bort från kontaktlistan"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Du är på väg att ta bort \"%(name)s\" (%(jid)s) från din kontaktlista.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9313,11 +9340,11 @@ msgstr ""
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9325,53 +9352,54 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
 "Kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Jag vill att denna kontakten skall känna till min status även efter "
 "borttagningen"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter kommer att tas bort från din kontaktlista"
 
-#: ../src/roster_window.py:3231
-#, fuzzy, python-format
+#: ../src/roster_window.py:3238
+#, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
-"Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen "
-"vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
+"Genom att ta bort dessa kontakter:%s\n"
+"så kommer du även ta bort behörigheten vilket resulterar i att kontakten "
+"kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9379,13 +9407,13 @@ msgstr ""
 "Din server saknar stöd för att lagra information om metakontakter. Denna "
 "information kommer därför inte att sparas vid nästa återanslutning."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9395,24 +9423,24 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ogiltig Fil"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vill du skicka denna fil till %s:"
 msgstr[1] "Vill du skicka dessa filer till %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Skicka %s"
+msgstr "Skicka %s till %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gör %s till en metakontakt för %s"
@@ -9422,157 +9450,157 @@ msgstr "Gör %s till en metakontakt för %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "använder kontot %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "använder %s-kontot"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Hantera bokmärken..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Ändra statusmeddelande"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Publicera låt"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Konfigurera tjänster..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Maximera alla"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Skicka gruppm_eddelande"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Till alla användare"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Till alla anslutna användare"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Hantera kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Skicka ett meddelande"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Hantera transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Ändra transport"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Maximera"
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Koppla från"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Koppla från"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Historikhanterare"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Gå in i ny gruppchatt"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Ändra statusmeddelande..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Väntar på resultat"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
-msgstr ""
+msgstr "Inga resultat"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Ämne: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Bekräfta dessa sessionsalternativ"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9587,7 +9615,7 @@ msgstr ""
 "\n"
 "\tGodtar du dessa alternativ?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9602,116 +9630,116 @@ msgstr ""
 "\n"
 "Vill du fortsätta med sessionen?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Byt Statusmeddelande..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Dölj denna meny"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av den här gruppchatten"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [blockerad]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [minimerad]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Senaste status: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " sedan %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Prenumeration: "
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Låt:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Hämta"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Skicka upp"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Inte startad"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Färdigställd"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pausad"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Denna tjänst har ännu inte svarat med detaljerad information"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9719,28 +9747,28 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
 msgstr "?Tid:Okänd"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "sedan %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tillhörighet:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9748,7 +9776,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9756,30 +9784,83 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Du och kontakten är intresserade av varandras närvaroinformation"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Varken du eller kontakten är intresserad av varandras närvaroinformation"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du väntar på kontaktens svar på din förfrågan om prenumeration"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "Det finns inga väntande prenumerationsbegäran."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Inkommande meddelande:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "_Utgående meddelande:"
+
+#~ msgid "gtk-ok"
+#~ msgstr "OK"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Värden %s som du konfigurerade som det avancerade alternativet "
+#~ "ft_add_hosts_to_send är inte giltig, därför ignoreras den."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Lösenordsfras för OpenPGP angavs inte"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "För att fortsätta skicka och ta emot meddelanden måste du återansluta."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Du är inte ansluten eller visas inte för andra. Ditt meddelande kunde "
+#~ "inte skickas."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Det här meddelandet är krypterat]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i dagar sen"
+
+#~ msgid "Trayicon"
+#~ msgstr "Aktivitetsikon"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "En ikon i aktivitetsfältet som beskriver aktuell närvaro."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Kräver python-gnome2-extras eller kompilerad trayicon-modul från Gajims "
+#~ "källkod."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Kräver PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Lägg till speciell _notifiering"
 
@@ -9826,9 +9907,8 @@ msgstr " resurs med prioritet "
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
 
-#, fuzzy
 #~ msgid "Nickname not found"
-#~ msgstr "Smeknamnet kunde inte hittas: %s"
+#~ msgstr "Smeknamnet hittades inte"
 
 #, fuzzy
 #~ msgid ""
@@ -9841,13 +9921,12 @@ msgstr " resurs med prioritet "
 #~ "befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
 #~ "Stödjer INTE mellanslag i smeknamn."
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname>, opens a private chat window with the specified "
 #~ "occupant."
 #~ msgstr ""
-#~ "Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
-#~ "specificerade deltagaren."
+#~ "Användning: /%s <smeknamn>, öppnar ett privat chattfönster med den "
+#~ "angivna deltagaren."
 
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
@@ -9856,13 +9935,12 @@ msgstr " resurs med prioritet "
 #~ "Användning: /%s [anledning], stänger aktuellt fönster eller flik och "
 #~ "visar anledning om sådan specificerades."
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
 #~ "optionally providing a reason."
 #~ msgstr ""
-#~ "Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
-#~ "valbar anledning."
+#~ "Användning: /%s <JID> [anledning], bjuder in JID till den aktuella "
+#~ "gruppchatten med en valfri anledning."
 
 #~ msgid ""
 #~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
@@ -9871,23 +9949,20 @@ msgstr " resurs med prioritet "
 #~ "Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i "
 #~ "rum@server med valbart smeknamn"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
 #~ "nickname from the group chat and optionally displays a reason."
 #~ msgstr ""
-#~ "Användning: /%s <smeknamn> [anledning], tar bort medlemmen angiven med "
-#~ "smeknamn från gruppchatten och visar en valfri anledning. Tillåter INTE "
-#~ "blanksteg i smeknamnet."
+#~ "Användning: /%s <smeknamn> [anledning], tar bort deltagaren angiven med "
+#~ "smeknamn från gruppchatten och visar en valfri anledning."
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
 #~ "message to the occupant specified by nickname."
 #~ msgstr ""
 #~ "Användning: /%s <smeknamn> [meddelande], öppnar ett privat "
-#~ "meddelandefönster och skickar ett meddelande till medlemmen specificerad "
-#~ "med smeknamn."
+#~ "meddelandefönster och skickar ett meddelande till deltagaren angiven med "
+#~ "smeknamn."
 
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr ""
@@ -9908,12 +9983,19 @@ msgstr " resurs med prioritet "
 #~ "Användning: /%s <meddelande>, skickar meddelande utan att leta efter "
 #~ "andra kommandon."
 
-#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
+#~ "messages."
+#~ msgstr ""
+#~ "Användning: /%s <smeknamn>, förhindra <smeknamn> att skicka dig "
+#~ "meddelanden eller privata meddelanden."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
 #~ "messages."
 #~ msgstr ""
-#~ "Användning: /%s <smeknamn>, ändrar ditt smeknamn i aktuell gruppchatt."
+#~ "Användning: /%s <smeknamn>, tillåt <smeknamn> att skicka dig meddelanden "
+#~ "och privata meddelanden."
 
 #~ msgid "Your JID:"
 #~ msgstr "Ditt JID:"
@@ -10410,9 +10492,6 @@ msgstr " resurs med prioritet "
 #~ msgid "A_fter nickname:"
 #~ msgstr "E_fter smeknamn:"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "För_e smeknamn:"
-
 #~ msgid "_After time:"
 #~ msgstr "Efter tid:"
 
diff --git a/po/uk.po b/po/uk.po
index 50ee3792e..561303cb7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
-"PO-Revision-Date: 2009-08-20 00:06+0200\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"PO-Revision-Date: 2009-10-30 00:24+0200\n"
 "Last-Translator: Sergiy Yegorov <prapor@unixzone.org.ua>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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.3\n"
+"X-Generator: Lokalize 1.0\n"
 
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
@@ -107,9 +107,8 @@ msgstr ""
 "SHA1 відбиток сертифікату:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "Використовувати розпізнавання на проксі"
+msgstr "Анонімна авторизація"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
@@ -287,9 +286,9 @@ msgstr "Редагувати особисті відомості..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -298,9 +297,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "Загальне"
 
@@ -361,21 +360,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Відомості про вас, які зберігаються на сервері"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "Не обрано жодного ключа"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "Немає"
 
@@ -489,9 +488,8 @@ msgid "Accounts"
 msgstr "Облікові записи"
 
 #: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "Використовувати розпізнавання на проксі"
+msgstr "Анонімна аутентифікація"
 
 #: ../data/glade/accounts_window.glade.h:13
 msgid ""
@@ -532,8 +530,8 @@ msgstr ""
 "Можливо, вам також доведеться змінити параметри брандмауера."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -547,7 +545,7 @@ msgid "Mer_ge accounts"
 msgstr "Об’є_днати облікові записи"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "Пере_йменувати"
 
@@ -945,7 +943,7 @@ msgstr "Востаннє змінено:"
 msgid "New entry received"
 msgstr "Отримано новий запис"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Ви отримали новий запис:"
 
@@ -989,11 +987,11 @@ msgstr "Введіть новий пароль:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Вкажіть ваше нове повідомлення стану</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 msgid "Activity:"
 msgstr "Заняття:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 msgid "Mood:"
 msgstr "Настрій:"
 
@@ -1073,7 +1071,6 @@ msgid "Assign Open_PGP Key..."
 msgstr "Призначити кл_юч OpenPGP..."
 
 #: ../data/glade/contact_context_menu.glade.h:4
-#, fuzzy
 msgid "E_xecute Command..."
 msgstr "Виконати команду..."
 
@@ -1083,8 +1080,8 @@ msgstr "Редагувати _групи..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "За_просити до"
 
@@ -1097,8 +1094,8 @@ msgid "Remo_ve"
 msgstr "В_илучити"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 msgid "Send Cus_tom Status"
 msgstr "Надіслати не_типовий стан"
 
@@ -1131,8 +1128,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Дозволити йому/їй бачити мій стан"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr "_Заблокувати"
 
@@ -1143,7 +1140,7 @@ msgstr "_Заборонити йому/їй бачити мій стан"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "_Журнал"
 
@@ -1164,8 +1161,8 @@ msgid "_Subscription"
 msgstr "_Підписка"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr "_Розблокувати"
 
@@ -1253,7 +1250,7 @@ msgstr ""
 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:820
 msgid "_Continue"
 msgstr "_Продовжити"
 
@@ -1261,7 +1258,7 @@ msgstr "_Продовжити"
 msgid "_Notify me when a file transfer is complete"
 msgstr "П_овідомити мене про завершення передавання файлу"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "В_ідкриту теку, яка містить цей файл"
 
@@ -1289,7 +1286,7 @@ msgstr ""
 "Рядок контакту\n"
 "Заголовок балачки"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "Жирний"
 
@@ -1309,11 +1306,11 @@ msgstr "Налаштування тем Gajim"
 msgid "Gone"
 msgstr "Пішов"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Неактивний"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1361,7 +1358,7 @@ msgstr "Змінити _тему..."
 msgid "Configure _Room..."
 msgstr "Налаштувати _кімнату..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 msgid "_Bookmark"
 msgstr "_Закладка"
 
@@ -1451,8 +1448,9 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 "<big><b>Ласкаво просимо до інструменту керування журналами Gajim</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "Вилучити"
 
@@ -1483,7 +1481,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Шукати у базі даних"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Журнал спілкування"
 
@@ -1507,11 +1505,10 @@ msgid "_Log conversation history"
 msgstr "_Зберігати журнал спілкування"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#, fuzzy
 msgid "Bookmark this room"
-msgstr "Зробити закладку на цій кімнаті (Ctrl+B)"
+msgstr "Зробити закладку на цій кімнаті"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "Приєднатись до групової балачки"
 
@@ -1538,8 +1535,8 @@ msgstr "Нещодавно:"
 msgid "Room:"
 msgstr "Кімната:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "При_єднатися"
 
@@ -1569,7 +1566,7 @@ msgstr "Мінімізувати після автоматичного приє�
 msgid "Print status:"
 msgstr "Показувати стан:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -1680,17 +1677,26 @@ msgid "Show a list of formattings"
 msgstr "Показати список інструментів форматування"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
 msgstr "Показати меню додаткових можливостей (Alt+A)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Показати профіль контакту (Ctrl+I)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Надіслати"
 
@@ -1805,7 +1811,7 @@ msgstr ""
 "Автоматично визначати під час запуску Gajim\n"
 "Завжди використовувати типові програми GNOME\n"
 "Завжди використовувати типові програми KDE\n"
-"Завжди використовувати типові програми XFCE\n"
+"Завжди використовувати типові програми Xfce\n"
 "Власний набір"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1821,6 +1827,16 @@ msgid "Configure color and font of the interface"
 msgstr "Налаштувати шрифт та колір інтерфейсу"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Повідомлення балачки:"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Ім'я контакту"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1834,31 +1850,31 @@ msgstr ""
 "Виокремлений реєстр з вікнами для кожного облікового запису\n"
 "Виокремлений реєстр з вікнами балачок за типом"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _activity of contacts in roster"
 msgstr "Показувати _заняття контактів у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "Показати _подробиці щодо скриньки"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display _tunes of contacts in roster"
 msgstr "Показувати _музику контактів у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показувати _аватари контактів у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid "Display m_ood of contacts in roster"
 msgstr "Показувати _настрій контактів у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "Показувати _повідомлення  про стан контактів з реєстру"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1868,7 +1884,7 @@ msgstr ""
 "ви вели з контактом. Тут ви можете вказати стани, які ви бажаєте бачити у "
 "вікні розмови."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1878,7 +1894,7 @@ msgstr ""
 "спілкуванням з контактом. Тут ви можете зазначити стани, які ви бажаєте "
 "надсилати іншому учаснику балачки."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1886,11 +1902,11 @@ msgstr ""
 "Gajim буде сповіщати вас про вихід з мережі контактів за допомогою "
 "контекстного вікна у нижній правій частині екрана"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Hide all buttons in chat windows"
 msgstr "Сховати усі кнопки у вікнах балачок"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1898,7 +1914,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim дозволить іншим визначати, яку "
 "операційну систему ви використовуєте"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1906,14 +1922,14 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде також додавати інформацію про "
 "авторів листів"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде змінювати стан на «Відсутній», якщо "
 "комп’ютер не використовуватиметься."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1921,7 +1937,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim змінюватиме стан на «Недоступний», якщо "
 "на комп’ютері не спостерігатиметься активності користувача довше, ніж"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1929,7 +1945,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати аватари контактів у "
 "вікні реєстру і групових балачках"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1937,28 +1953,28 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати повідомлення про стан "
 "під ім'ям контакту у вікні реєстру і групових балачках"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim показуватиме рід занять контактів у "
 "вікні реєстру"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у вікні "
 "реєстру"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim показуватиме музику, яку слухають "
 "контакти у вікні реєстру"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 "
@@ -1969,7 +1985,7 @@ msgstr ""
 "контекстного меню (клацання правою кнопкою миші), буде використано типову "
 "мову для контакту або групової балачки."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1980,7 +1996,7 @@ msgstr ""
 "можливістю, оскільки її за її використання всі повідомлення від контактів, "
 "яких немає у реєстрі, буде заблоковано."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 "
@@ -1991,7 +2007,7 @@ msgstr ""
 "E2E, ваш співрозмовник має погодитися на запис до журналу, інакше "
 "повідомлення не буде записано до журналу."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1999,7 +2015,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim показуватиме сповіщення про нові листи, "
 "отримані поштовою скринькою GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2009,7 +2025,7 @@ msgstr ""
 "протоколу піктограми станів. (Приклад: для контактів MSN будуть використані "
 "відповідні піктограми msn для станів «в мережі», «відсутній» тощо)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2017,7 +2033,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim не запитуватиме про повідомлення стану. "
 "Програма використовуватиме вказане типове повідомлення."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2025,19 +2041,19 @@ msgstr ""
 "Якщо цей пункт буде позначено, Gajim замінюватиме ascii-емоційки, наприклад, "
 "':)' відповідними статичними або анімованими емоційками"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr "Записувати до журналу _шифровані сеанси балачки"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Ma_ke message windows compact"
 msgstr "У_щільнити компонування вікон повідомлень"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "Ке_рування..."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
@@ -2047,31 +2063,31 @@ msgstr ""
 "Лише події, що очікують уваги\n"
 "Завжди"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notifications"
 msgstr "Сповіщення"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify me about contacts that sign _in"
 msgstr "Сповіщати мене про в_хід контактів до мережі"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Notify me about contacts that sign _out"
 msgstr "Сповіщати мене про в_ихід контактів з мережі"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "Сповіщати про нові листи _GMail"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Personal Events"
 msgstr "Особисті події"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "Відтворювати _звуки"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -2081,23 +2097,23 @@ msgstr ""
 "Сповіщати мене про це\n"
 "Просто показати у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Show systray:"
 msgstr "_Показати подію у системному лотку"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "Уві_йти"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "Вий_ти"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2106,27 +2122,27 @@ msgstr ""
 "тексту, кольори тощо). Якщо буде позначено цей пункт, Gajim показуватиме "
 "простий текст без форматування."
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Sort contacts by status"
 msgstr "Впорядкувати контакти за станом"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "Стан"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 msgid "Status _iconset:"
 msgstr "Набір _піктограм стану:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 msgid "Style"
 msgstr "Стиль"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "Т_ема:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2136,7 +2152,7 @@ msgstr ""
 "Автоматичне повідомлення про відсутність. Якщо ви не вкажете тексту "
 "повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2146,103 +2162,105 @@ msgstr ""
 "Автоматичне повідомлення про недоступність. Якщо ви не вкажете тексту "
 "повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "Use _transports icons"
 msgstr "Використовувати піктограми _транспортів"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "Використовувати _типове для системи"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "When new event is received:"
 msgstr "Якщо отримано нову подію:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "Повідомлення про помилку: %s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Псевдонім:"
+
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Away after:"
 msgstr "«_Відсутній» через:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "_Веб-переглядач:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Display chat state notifications:"
 msgstr "_Показувати сповіщення стану балачки:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Emoticons:"
 msgstr "_Емоційки:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "_Менеджер файлів:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "_Виділяти слова з помилками"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ігнорувати події від контактів поза реєстром"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ігнорувати позначки форматування у вхідних повідомленнях"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "_Вхідне повідомлення:"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "_Записувати зміни стану контактів"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "_Поштовий клієнт:"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Not available after:"
 msgstr "«_Не доступний» через:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "_Відкрити..."
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "Повідомлення про ви_хід:"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "В_ідновити типові кольори"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_Send chat state notifications:"
 msgstr "_Надсилати сповіщення про стан балачки:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "_Повідомлення про стан:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr "Вид_ілення адрес URL:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr "Пов_едінка вікна:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 msgid "in _group chats"
 msgstr "у _групових балачках"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 msgid "in _roster"
 msgstr "у _реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "хвилин"
 
@@ -2275,9 +2293,8 @@ msgid "All"
 msgstr "Всі"
 
 #: ../data/glade/privacy_list_window.glade.h:7
-#, fuzzy
 msgid "All (including subscription)"
-msgstr "всі за підпискою"
+msgstr "Всі (за підпискою)"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
@@ -2295,7 +2312,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Порядок:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "Список конфіденційності"
 
@@ -2439,7 +2456,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Префікс:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 msgid "<b>Role:</b>"
 msgstr "<b>Роль:</b>"
 
@@ -2499,8 +2516,8 @@ msgstr "Вилучити обліковий запис з Gajim та з _сер�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "В_илучити"
 
@@ -2509,24 +2526,26 @@ msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
+"<b>someone@somewhere.com</b> бажає <b>додати</b> до вашого реєстру де-які "
+"контакти."
 
 #: ../data/glade/roster_item_exchange_window.glade.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
+"Тіло повідомлення <наразі не використовується, тому зазвичай приховане>"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:3
 msgid "Roster Item Exchange"
-msgstr ""
+msgstr "Обмін елементами реєстру"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_Гаразд"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk-close"
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
@@ -2583,7 +2602,7 @@ msgstr "_Дії"
 msgid "_Contents"
 msgstr "_Вміст"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "_Правка"
 
@@ -2624,11 +2643,11 @@ msgid "_Add contact"
 msgstr "Дод_ати контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 msgid "_Information"
 msgstr "_Інформація"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "_Пошук"
 
@@ -2648,10 +2667,6 @@ msgstr "Зареєструватись на"
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "_Гаразд"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2860,282 +2875,267 @@ msgstr "Ресурс:"
 msgid "Status:"
 msgstr "Стан:"
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 msgid "Cancel confirmation"
 msgstr "Скасувати підтвердження"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Зараз виконується команда. Ви справді бажаєте скасувати її виконання?"
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr "Служба надіслала неправильно форматовані дані"
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr "Служба змінила ідентифікатор сеансу."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr "Служба повернула повідомлення про помилку."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Activated"
 msgstr "Увімкнено"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 msgid "Deactivated"
 msgstr "Вимкнено"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr "Булеве"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 msgid "Integer"
 msgstr "Ціле число"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr "Колір"
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "Назва параметра"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "Значення"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(Немає)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "Сховано"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, fuzzy, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr "Ви отримали новий запис:"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Ви отримали нові записи (та %(count)d не була показана):"
+msgstr[1] "Ви отримали нові записи (та %(count)d не була показана):"
+msgstr[2] "Ви отримали нові записи (та %(count)d не була показана):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "Англійська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Belarusian"
 msgstr "Білоруська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Болгарська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Breton"
 msgstr "Бретонська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Чеська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "Німецька"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Грецька"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "British"
 msgstr "Британська англійська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Basque"
 msgstr "Баскська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "Французька"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Хорватська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Італійська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian (b)"
 msgstr "Норвезька (b)"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Нідерландська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Norwegian"
 msgstr "Норвезька"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Польська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Португальська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Бразильська португальська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Російська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Serbian"
 msgstr "Сербська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Словацька"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Шведська"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "Китайська (Ch)"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "Мова перевірки правопису"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "З'єднання недоступне"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше повідомлення не може бути відправлене до встановлення з'єднання."
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 msgid "Underline"
 msgstr "Підкреслити"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 msgid "Strike"
 msgstr "Перекреслити"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 msgid "Clear formating"
 msgstr "Зняти форматування"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr "Справді надіслати файл?"
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, 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:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 msgid "GPG encryption enabled"
 msgstr "Шифрування GPG увімкнено"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "Немає у реєстрі"
 
-#: ../src/chat_control.py:1359
-#, fuzzy
+#: ../src/chat_control.py:1480
 msgid "This contact does not support file transfer."
-msgstr "Перелік активних, завершених та зупинених передач файлів"
+msgstr "Цей контакт не підтримує передавання файлів."
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr ""
+msgstr "Ви маєте знати справжній JID контакту, щоб надсилати йому чи їй файл."
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr "Невідомий виконавець"
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr "Невідома назва"
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr "Невідоме джерело"
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"з <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, 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:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr "Немає ключа GPG"
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3143,50 +3143,50 @@ msgstr ""
 "З цим контактом не пов’язано жодного ключа GPG. Отже ви не зможете шифрувати "
 "повідомлення за допомогою GPG."
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 msgid "GPG encryption disabled"
 msgstr "Шифрування GPG вимкнено"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr "Сеанс БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr "Сеанс НЕ БУДЕ записано до журналу"
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr "є"
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr "НЕ є"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr "буде"
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr "НЕ буде"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 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:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3195,23 +3195,23 @@ msgstr ""
 "Шифрування %(type)s %(status)s активним %(authenticated)s.\n"
 "Ваш сеанс балачки %(logged)s записано до журналу."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr "Встановлення сеансу було скасовано"
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 msgid "This session is encrypted"
 msgstr "Цей сеанс зашифровано"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr " і БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr " і НЕ БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3219,25 +3219,25 @@ msgstr ""
 "Особу віддаленого контакту не було перевірено. Натисніть кнопку з щитом, щоб "
 "ознайомитися з подробицями."
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 msgid "E2E encryption disabled"
 msgstr "Шифрування E2E вимкнено"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 msgid "The following message was NOT encrypted"
 msgstr "Наступне повідомлення НЕ було зашифровано"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 msgid "The following message was encrypted"
 msgstr "Наступне повідомлення було зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3245,15 +3245,15 @@ msgstr ""
 "Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
 "втрачено."
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3262,7 +3262,7 @@ msgstr ""
 "Не вдалося прочитати файл бази даних (%s). Спробуйте виправити або вилучити "
 "його (всі записи журналу буде втрачено)."
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s тепер %(status)s"
@@ -3271,23 +3271,23 @@ msgstr "%(name)s тепер %(status)s"
 msgid "creating logs database"
 msgstr "створення бази даних журналів"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s є файлом, а має бути каталогом"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Зараз Gajim завершить роботу"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s є каталогом, а має бути файлом"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "створення каталогу %s"
@@ -3350,10 +3350,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Оберіть групові балачки, які ви бажаєте полишити"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 msgid "Groupchats"
 msgstr "Групові балачки"
 
@@ -3418,49 +3418,44 @@ msgstr ""
 "події (on_event) та завжди (always)."
 
 #: ../src/common/config.py:93
-#, fuzzy
 msgid "Incoming nickname color."
-msgstr "Некоректний псевдонім"
+msgstr "Колір вхідного псевдоніму"
 
 #: ../src/common/config.py:94
 msgid "Outgoing nickname color."
-msgstr ""
+msgstr "Колір вихідного псевдоніма"
 
 #: ../src/common/config.py:95
 msgid "Incoming text color."
-msgstr ""
+msgstr "Колір вхідного тексту"
 
 #: ../src/common/config.py:96
 msgid "Outgoing text color."
-msgstr ""
+msgstr "Колір вихідного тексту"
 
 #: ../src/common/config.py:97
-#, fuzzy
 msgid "Status message text color."
-msgstr "текст повідомлення про стан"
+msgstr "Колір тексту повідомлення сповіщення про стан."
 
 #: ../src/common/config.py:100
-#, fuzzy
 msgid "Incoming nickname font."
-msgstr "Некоректний псевдонім"
+msgstr "Шрифт вхідного псевдоніму"
 
 #: ../src/common/config.py:101
-#, fuzzy
 msgid "Outgoing nickname font."
-msgstr "Зміна псевдоніма"
+msgstr "Шрифт вихідного псевдоніма."
 
 #: ../src/common/config.py:102
 msgid "Incoming text font."
-msgstr ""
+msgstr "Шрифт вхідного тексту"
 
 #: ../src/common/config.py:103
 msgid "Outgoing text font."
-msgstr ""
+msgstr "Шрифт вихідного тексту"
 
 #: ../src/common/config.py:104
-#, fuzzy
 msgid "Status message text font."
-msgstr "текст повідомлення про стан"
+msgstr "Шрифт тексту сповіщення про стан."
 
 #: ../src/common/config.py:105
 msgid ""
@@ -3470,9 +3465,9 @@ msgstr ""
 "згорнуто."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 msgid "default"
 msgstr "типовий"
 
@@ -3579,16 +3574,20 @@ msgstr ""
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
 msgstr ""
+"Як багато робити запитів до сервера при під’єднанні до групової балачки."
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr ""
+msgstr "За скільки хвилин запитувати журнал, при вході у групову балачку."
 
 #: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
+"Скільки секунд очікувати перш ніж повторити спробу перепід’єднатись до "
+"конференції від якої вас було від’єднано. Встановіть 0 для блокування "
+"автоматичного перепід’єднання."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -3679,6 +3678,9 @@ 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:192
 msgid ""
@@ -3938,22 +3940,21 @@ msgstr ""
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
 #: ../src/common/config.py:257
-#, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
+"Чи слід показувати діалогове вікно підтвердження блокування контактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
 #: ../src/common/config.py:258
-#, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
-"Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
+"Чи слід показувати діалогове вікно підтвердження створення особливих "
+"статусів? Порожній рядок вказуватиме на те, що це діалогове вікно не слід "
+"показувати."
 
 #: ../src/common/config.py:259
 msgid ""
@@ -3975,13 +3976,13 @@ msgstr ""
 "Keyring (за його наявності) для зберігання паролі облікових записів."
 
 #: ../src/common/config.py:261
-#, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
-"Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome "
-"Keyring (за його наявності) для зберігання паролі облікових записів."
+"Якщо цей параметр матиме значення «True», Gajim використовуватиме менеджер "
+"торбинок KDE (якщо kwalletcli доступний) для зберігання паролів облікових "
+"записів."
 
 #: ../src/common/config.py:262
 msgid ""
@@ -4073,12 +4074,16 @@ msgstr ""
 #: ../src/common/config.py:273
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
+"Якщо Істино, доповнення у групових балачках будуть схожі на автодоповнення "
+"командної оболонки."
 
 #: ../src/common/config.py:274
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
+"Коли показувати запис власного контакту. Може бути \"завжди\", "
+"\"коли_інший_ресурс\" або \"ніколи\""
 
 #: ../src/common/config.py:286
 msgid ""
@@ -4104,15 +4109,14 @@ msgstr "Якщо увімкнено, відновлювати попередні
 #: ../src/common/config.py:297
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
-msgstr ""
+msgstr "Якщо Істино, усі запити авторизації буде автоматично задоволено."
 
 #: ../src/common/config.py:298
-#, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
-"Якщо цей параметр матиме значення «False», ви не бачитимете аватарів у вікні "
-"балачки."
+"Якщо цей параметр матиме значення «False», обліковий запис буде вимкнено та "
+"не буде відображатись у вікні реєстру."
 
 #: ../src/common/config.py:301
 msgid ""
@@ -4156,14 +4160,13 @@ msgstr "Відокремлений пробілами список помило�
 
 #: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
-msgstr ""
+msgstr "Надсилання порожнього повідомлення після неактивності."
 
 #: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
-msgstr ""
+msgstr "Надсилання XMPP ехо після неактивності."
 
 #: ../src/common/config.py:323
-#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4177,7 +4180,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Обхідний прийом для Jabberd2"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4186,15 +4189,15 @@ msgstr ""
 "проксі сервери, визначення параметром file_transfer_proxies, для передавання "
 "файлів."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr "Відповідати на запити щодо підтвердження отримання"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr "Надіслані запити на підтвердження отримання"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4202,11 +4205,11 @@ msgstr ""
 "Під час налаштування сеансу з шифруванням, чи слід Gajim припускати, що ви "
 "бажаєте вести запис повідомлень?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Чи увімкнено OpenPGP для цього контакту?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4214,101 +4217,101 @@ msgstr ""
 "Чи має Gajim за можливості автоматично запускати шифрований сеанс "
 "спілкування з цим контактом?"
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "all або відокремлені пробілами стани"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' або 'both'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'так', 'ні' або ''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Їм"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "Відео"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Працюю"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 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."
@@ -4317,102 +4320,101 @@ msgstr ""
 "зі слів, вказаних за допомогою параметра muc_highlight_words, або якщо "
 "повідомлення групової балачки містить ваш псевдонім."
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "зелений"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "овочевий"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "тілесний"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "морський"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Не вдалося завантажити модуль перевірки відсутності активності"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "Вузол вказано помилково"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr "Некоректна локальна адреса? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Відомості щодо реєстрації з транспорту %s не надійшли протягом визначеного "
 "проміжку часу"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 msgid "Registration succeeded"
 msgstr "Зареєструватися на %s"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Реєстрацію з агентом %s вдало закінчено"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 msgid "Registration failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Реєстрація з агентом %(agent)s невдала через помилку %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr "Помилка під час спроби запису на диск"
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 msgid "Invisibility not supported"
 msgstr "Невидимість не підтримується"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Обліковий запис %s не підтримує невидимості."
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 "Надійшло повідомлення від некоректного JID, це повідомлення було "
 "проігноровано."
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4422,7 +4424,7 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) або вилучити його (всі журнали "
 "буде втрачено)."
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Заборонений псевдонім: %s"
@@ -4430,78 +4432,78 @@ msgstr "Заборонений псевдонім: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
-msgstr ""
+msgstr "Максимальна кількість користувачів %s вже досягнута."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вас заблокували у груповій балачці %s."
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групової балачки %s не існує."
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "Можливість створення групових балачок обмежено."
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr ""
 "Для групової балачки %s слід використовувати псевдонім, під яким ви "
 "зареєструвалися."
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, 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:2363
+#: ../src/common/connection_handlers.py:2354
 msgid "Room has been destroyed"
 msgstr "Кімнату було знищено"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Ви можете приєднатися до цієї кімнати замість %s"
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "тепер ми підписані на %s"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запит на скасування підписки від %s"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "підписку на %s скасовано"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4639,82 +4641,111 @@ msgstr "До призначення ключа не належить підпи�
 msgid "Application verification failure"
 msgstr "Помилка під час перевірки програми"
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, 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:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr "Не підписано повідомлення про присутність, ключа також не призначено."
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+"Ключ контакту (%s) не збігається з ключем, призначеним для нього у Gajim."
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Це повідомлення *зашифровано* (див. :XEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Тема: %(subject)s\n"
+"%(message)s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "З’єднання з обліковим записом «%s» було втрачено"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "Виконати повторне з’єднання вручну."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Від сервера %(name)s було отримано помилкову відповідь на запит щодо "
 "реєстрації: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "На сервері %s передбачено іншу форму реєстрації"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Невідома помилка SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "Некоректна відповідь"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспорт %(name)s надіслав помилкову відповідь на запит щодо реєстрації: %"
 "(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не вдалося з’єднатися з «%s»"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "Перевірте ваше з’єднання, а потім повторіть спробу."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, python-format
 msgid "Server replied: %s"
 msgstr "Збережено за адресою: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 msgid "Connection to proxy failed"
 msgstr "Спроба встановити з'єднання з проксі-сервером завершилася невдало"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не вдалося з’єднатися з обліковим записом %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "З’єднання з обліковим записом було втрачено %s. Повторна спроба з’єднання."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достовірність сертифіката %s знаходиться під питанням."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
@@ -4723,7 +4754,7 @@ msgstr ""
 "\n"
 "Помилка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, python-format
 msgid ""
 "\n"
@@ -4732,24 +4763,24 @@ msgstr ""
 "\n"
 "Невідома помилка SSL: %d"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "Перевірте ваше з’єднання або повторіть спробу пізніше"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "Будь ласка, перевірте, чи правильно вказано ім’я користувача і пароль."
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 msgid "Error while removing privacy list"
 msgstr "Помилка під час вилучення списку конфіденційності"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4759,78 +4790,44 @@ msgstr ""
 "у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і "
 "повторіть спробу."
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Неможливо надіслати повідомлення до %s, вказаний JID не є коректним."
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Не підписано повідомлення про присутність, ключа також не призначено."
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-"Ключ контакту (%s) не збігається з ключем, призначеним для нього у Gajim."
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Це повідомлення *зашифровано* (див. :XEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"Тема: %(subject)s\n"
-"%(message)s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr ""
+msgstr "Відправлений контакт:  \"%s\" (%s)"
 
-#: ../src/common/connection.py:1386
-#, fuzzy
+#: ../src/common/connection.py:1544
 msgid "Sent contacts:"
-msgstr "Запросити _контакти"
+msgstr "Надіслати контакти:"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "Не отримано через стан невидимості"
 
-#: ../src/common/connection.py:1982
-#, fuzzy
+#: ../src/common/connection.py:2106
 msgid "Unregister failed"
-msgstr "Спроба з’єднання завершилася невдало"
+msgstr "Спроба скасування реєстрації завершилася невдало"
 
-#: ../src/common/connection.py:1983
-#, fuzzy, python-format
+#: ../src/common/connection.py:2107
+#, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
-"Реєстрація з агентом %(agent)s невдала через помилку %(error)s: %(error_msg)s"
+"Видалення реєстрації з серверу %(server)s не вдалося через помилку: %(error)s"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "Спостерігачі"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "Транспорти"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 msgid "Not in roster"
 msgstr "Немає у реєстрі"
 
@@ -4846,7 +4843,7 @@ msgstr "Можливості роботи з D-Bus у Gajim не може бут
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:50
 msgid "D-Bus does not run correctly on this machine"
-msgstr ""
+msgstr "D-Bus не працює коректно на цій машині."
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -5079,7 +5076,7 @@ msgstr "Вільний для балачки"
 msgid "_Available"
 msgstr "_Доступний"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "Доступний"
 
@@ -5197,48 +5194,48 @@ msgid "has closed the chat window or tab"
 msgstr "закрив (закрила) вікно або вкладку балачки"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s кіБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5246,22 +5243,22 @@ msgstr[0] "у черзі %d повідомлення"
 msgstr[1] "у черзі %d повідомлення"
 msgstr[2] "у черзі %d повідомлень"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, python-format
 msgid " from room %s"
 msgstr " з кімнати %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, python-format
 msgid " from user %s"
 msgstr " від користувача %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, python-format
 msgid " from %s"
 msgstr " від %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5269,7 +5266,7 @@ msgstr[0] "у черзі %d подія"
 msgstr[1] "у черзі %d події"
 msgstr[2] "у черзі %d подій"
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5285,16 +5282,16 @@ msgid "%s is not a valid loglevel"
 msgstr "%s не є коректним рівнем журналювання"
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "помилка: не вдалося відкрити %s для читання"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "блакитний"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 msgid "migrating logs database to indices"
 msgstr "перехід від бази даних журналів до покажчика"
 
@@ -5303,634 +5300,655 @@ msgstr "перехід від бази даних журналів до пока
 msgid "XMPP account %s@%s"
 msgstr "облікового запису %s@%s"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr "Зляканий"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr "Зачарований"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr "Закоханий"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr "Злий"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr "Роздратований"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr "Стривожений"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 msgid "Aroused"
 msgstr "Збуджений"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr "Засоромлений"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 msgid "Bored"
 msgstr "Знудьгований"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 msgid "Brave"
 msgstr "Безстрашний"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr "Спокійний"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 msgid "Cautious"
 msgstr "Обережний"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 msgid "Cold"
 msgstr "Незворушний"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 msgid "Confident"
 msgstr "Впевнений"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr "Збентежений"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 msgid "Contemplative"
 msgstr "Задумливий"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 msgid "Contented"
 msgstr "Задоволений"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr "Недужий"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr "Шалений"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 msgid "Creative"
 msgstr "Творчий"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr "Допитливий"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 msgid "Dejected"
 msgstr "Пригнічений"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr "Пригнічений"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 msgid "Disappointed"
 msgstr "Розчарований"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr "Відражений"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 msgid "Dismayed"
 msgstr "Нажаханий"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 msgid "Distracted"
 msgstr "Зніяковілий"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr "Стурбований"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr "Сповнений заздрощів"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr "Захоплений"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr "Кокетливий"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr "Зневірений"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr "Дуже вдячний"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr "Засмучений"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 msgid "Grumpy"
 msgstr "Сердитий"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr "Винний"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr "Щасливий"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr "Сповнений надій"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 msgid "Hot"
 msgstr "Гарячий"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr "Скромний"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr "Принижений"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr "Голодний"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr "Поранений"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 msgid "Impressed"
 msgstr "Вражений"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr "Пригнічений величчю"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr "Закоханий"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr "Обурений"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr "Зацікавлений"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr "Отруєний"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 msgid "Invincible"
 msgstr "Невидимий"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr "Заздрісний"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 msgid "Lonely"
 msgstr "Одинокий"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 msgid "Lost"
 msgstr "Втрачений"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr "Щасливий"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 msgid "Mean"
 msgstr "Жалюгідний"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 msgid "Moody"
 msgstr "Смутний"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr "Знервований"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr "Нейтральний"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 msgid "Offended"
 msgstr "Ображений"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr "Обурений"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr "Грайливий"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 msgid "Proud"
 msgstr "Гордий"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr "Розслаблений"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 msgid "Relieved"
 msgstr "Врятований"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr "Співчутливий"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr "Нетерплячий"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 msgid "Sad"
 msgstr "Сумний"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr "Саркастичний"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 msgid "Satisfied"
 msgstr "Вдоволений"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr "Серйозний"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr "Шокований"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr "Сором’язливий"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 msgid "Sick"
 msgstr "Хворий"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 msgid "Sleepy"
 msgstr "Сонний"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr "Непередбачуваний"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 msgid "Stressed"
 msgstr "Напружений"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr "Сильний"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 msgid "Surprised"
 msgstr "Здивований"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr "Вдячний"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr "Спраглий"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 msgid "Tired"
 msgstr "Втомлений"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 msgid "Undefined"
 msgstr "Непевний"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr "Слабкий"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr "Занепокоєний"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 msgid "Doing Chores"
 msgstr "Займаюся повсякденною роботою"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr "Закуповую бакалію"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 msgid "Cleaning"
 msgstr "Прибираю"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 msgid "Cooking"
 msgstr "Куховарю"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr "Роблю ремонт"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr "Мию посуд"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr "Перу"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 msgid "Gardening"
 msgstr "Займаюся садівництвом"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr "У відрядженні"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 msgid "Walking the Dog"
 msgstr "Вигулюю собаку"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 msgid "Drinking"
 msgstr "Випиваю"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr "П’ю пиво"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr "П’ю каву"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr "П’ю чай"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr "Їм"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr "Снідаю"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr "Вечеряю"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr "Обідаю"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr "Вправляюся"
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Катаюся на велосипеді"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 msgid "Dancing"
 msgstr "Танцюю"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 msgid "Hiking"
 msgstr "Займаюся туризмом"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 msgid "Jogging"
 msgstr "Бігаю підтюпцем"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr "Граю у спортивні ігри"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr "Бігаю"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 msgid "Skiing"
 msgstr "Катаюся на лижах"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr "Займаюся плаванням"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 msgid "Working out"
 msgstr "Ладнаю справи"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr "Доглядаю за конем"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr "На гідромасажі"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Чищу зуби"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr "Стрижуся"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 msgid "Shaving"
 msgstr "Голюся"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr "Приймаю вану"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr "Приймаю душ"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr "На побаченні"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Вихідний"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 msgid "Hanging out"
 msgstr "Тиняюся"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 msgid "Hiding"
 msgstr "Ховаюся"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr "У відпустці"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 msgid "Praying"
 msgstr "Молюся"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr "Запланований вихідний"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 msgid "Thinking"
 msgstr "Думаю"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 msgid "Relaxing"
 msgstr "Розслабляюся"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 msgid "Fishing"
 msgstr "Рибалю"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Граюсь"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Гуляю"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Бере участь у вечірці"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Читаю"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Репетирую"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Роблю закупи"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Курю"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Спілкуюся"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Засмагаю"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Дивлюся телевізор"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Дивиться кіно"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Розмовляю"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "У реальному житті"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Розмовляю телефоном"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "Розмовляю відеотелефоном"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Подорожую"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Їду на роботу або з роботи"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Веду машину"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "У автомобілі"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "У автобусі"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "На літаку"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "У поїзді"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "У мандрах"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "На прогулянці"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Програмую"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "На зустрічі"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Вчуся"
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Пишу"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr "Невідомий виконавець"
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr "Невідома назва"
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr "Невідоме джерело"
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"з <i>%(source)s</i>"
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5953,38 +5971,11 @@ msgstr ""
 "[Це частина шифрованого сеансу. Якщо ви бачите це повідомлення, сталася "
 "якась помилка.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Вузол %s, який було налаштовано вами за допомогою параметра "
-"ft_add_hosts_to_send advanced записано некоректно, його буде проігноровано."
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "Не було вказано пароля OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "З’єднання з %s буде встановлено без OpenPGP."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Щоб продовжити надсилання і отримання повідомлень, вам потрібно повторити "
-"процедуру з’єднання."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Помилка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5993,54 +5984,45 @@ msgstr ""
 "%s\n"
 "Обмін локальними повідомленнями може працювати з помилками."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 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:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Не вдалося запустити локальну службу"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, 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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Будь ласка, переконайтеся, що запущено фонову службу avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не вдалося змінити стан облікового запису «%s»"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Ваш обліковий запис не з’єднано з сервером або цей обліковий запис перебуває "
-"у стані невидимості. Ваше повідомлення не може бути надіслано."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[Це повідомлення зашифровано]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Ваше повідомлення неможливо надіслати."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 "Контакт перебуває поза мережею. Ваше повідомлення не може бути надіслано."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6053,24 +6035,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Помилка під час додавання служби. %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "Вимкнено"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 msgid "Default Message"
 msgstr "Типове повідомлення"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Словники для мови %s не доступні"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6079,76 +6061,76 @@ msgstr ""
 "Ви маєте встановити словники %s для використання перевірки орфографії, або "
 "обрати іншу мову через параметр speller_language."
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "заголовок повідомлення про стан"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "текст повідомлення про стан"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "Повторно увійти зараз?"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з "
 "облікового запису, а потім знову туди увійти."
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 msgid "OpenPGP is not usable on this computer"
 msgstr "На цьому комп'ютері OpenPGP не придатне для використання"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "Непрочитані події"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Перш ніж вилучати цей обліковий запис, прочитайте усі повідомлення з черги "
 "подій."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Ви розпочали балачку за допомогою облікового запису %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
 "процедуру виходу?"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "Зараз ваш клієнт з’єднано з сервером"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 "Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для зміни назви облікового запису вам слід прочитати усі повідомлення з "
 "черги подій."
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "Така назва облікового запису вже використовується"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6156,150 +6138,148 @@ msgstr ""
 "Ви вже створили обліковий запис з такою назвою. Будь ласка, оберіть іншу "
 "назву."
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "Некоректна назва облікового запису"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "Назва облікового запису не може бути порожньою."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "Назва облікового запису не може містити пробіли."
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 msgid "Rename Account"
 msgstr "Перейменувати запис"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введіть нову назву для облікового запису %s"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ідентифікатор Jabber слід вказувати як «користувач@назва.сервера»."
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "Некоректний запис"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "Спроба отримання закритих ключів завершилася невдало"
 
-#: ../src/config.py:2116
-#, fuzzy
+#: ../src/config.py:2181
 msgid "There is no OpenPGP secret key available."
-msgstr "Виникла проблема з отриманням ваших закритих ключів OpenPGP."
+msgstr "Немає доступних закритих ключів OpenPGP."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "Вибір ключа OpenPGP"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "Оберіть свій ключ OpenPGP"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "Вказаний обліковий запис недоступний"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Вам слід створити обліковий запис, перш ніж розпочати редагування ваших "
 "особистих відомостей."
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без з’єднання ви не зможете редагувати ваші особисті відомості."
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не підтримує Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може зберігати ваші особисті відомості."
 
-#: ../src/config.py:2284 ../src/config.py:2318
-#, fuzzy
+#: ../src/config.py:2349 ../src/config.py:2383
 msgid "To disable the account, you must be disconnected."
 msgstr ""
-"Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
+"Для відключення облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "Обліковий запис Local вже існує."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Будь ласка, перейменуйте або вилучіть його, перш ніж вмикати локальні "
 "повідомлення."
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "Редагувати %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "Зареєструватися на %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "Список заборон"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "Список учасників"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "Список власників"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "Список адміністраторів"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "Підстава"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "Прізвисько"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "Роль"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "Блокування..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6307,11 +6287,11 @@ msgstr ""
 "<b>Кого ви бажаєте заблокувати?</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "Додавання учасника..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6319,11 +6299,11 @@ msgstr ""
 "<b>Кому ви бажаєте надати можливість участі?</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "Додавання власника..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6331,11 +6311,11 @@ msgstr ""
 "<b>Кого ви бажаєте зробити власником?</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "Додавання адміністратора..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6343,7 +6323,7 @@ msgstr ""
 "<b>Кого ви бажаєте зробити адміністратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6359,87 +6339,85 @@ msgstr ""
 "4. домен (пошук лише домену: записів користувач@домен,\n"
 "домен/ресурс або адреси, що містить піддомен)."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "Вилучення облікового запису %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "Слід ввести пароль"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "Зберегти пароль"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "Якщо ви вилучите його, з’єднання буде розірвано."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "Типовий"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "Всі"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "Лише вхід і вихід"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 msgid "?print_status:None"
 msgstr "Жодного"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "Створити групову балачку"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "У цій закладці містяться некоректні дані"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Будь ласка, заповніть поля сервера і кімнати або вилучіть цю закладку."
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 msgid "Invalid nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
-#, fuzzy
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 msgid "Character not allowed"
-msgstr "Заборонений псевдонім: %s"
+msgstr "Заборонений символ"
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 msgid "Invalid server"
 msgstr "Некоректний сервер"
 
-#: ../src/config.py:3069
-#, fuzzy
+#: ../src/config.py:3147
 msgid "Invalid room"
-msgstr "Некоректний запис"
+msgstr "Некоректна кімната"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "Обліковий запис було успішно додано"
 
-#: ../src/config.py:3221 ../src/config.py:3227
-#, fuzzy
+#: ../src/config.py:3300 ../src/config.py:3306
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6449,35 +6427,35 @@ msgstr ""
 "«Додатково». Пізніше ви можете виконати ті самі дії з налаштування вибором "
 "пункту «Облікові записи» у меню «Правка» головного вікна програми."
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "Ваш новий обліковий запис було успішно створено"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "Некоректне ім’я користувача"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 msgid "Please provide a server on which you want to register."
 msgstr ""
 "Будь ласка, вкажіть назву сервера, на якому ви бажаєте зареєструватися."
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 msgid "Certificate Already in File"
 msgstr "Сертифікат вже наявний у файлі"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Цей сертифікат вже існує у файлі %s, програма не буде додавати його ще раз."
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6492,7 +6470,7 @@ msgstr ""
 "Помилка SSL: %(error)s\n"
 "Ви все ще бажаєте з’єднатися з цим сервером?"
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6503,63 +6481,63 @@ msgstr ""
 "Відбиток SHA1 сертифіката:\n"
 "%s"
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 msgid "An error occurred during account creation"
 msgstr "Під час спроби створення облікового запису сталася помилка"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "Цю назву облікового запису вже використано"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "У вас вже є обліковий запис з такою назвою."
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "Активний"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "Подія"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "Перше отримане повідомлення"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 msgid "Next Message Received Focused"
 msgstr "Фокус на наступне отримане повідомлення"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 msgid "Next Message Received Unfocused"
 msgstr "Зняття фокусу з наступного отриманого повідомлення"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "Контакт з'єднано"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "Контакт від'єднано"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "Повідомлення надіслано"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "Виділення повідомлення групової балачки"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "Отримано електронного листа GMail "
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6569,7 +6547,7 @@ msgstr ""
 "отримано співрозмовником. Якщо програма показуватиме\n"
 "цю піктограму довго, ймовірно, повідомлення було втрачено."
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6577,229 +6555,226 @@ msgstr ""
 "Текст під цим рядком відповідає повідомленням, які було\n"
 "надіслано з часу, коли ви востаннє зазирали до цього вікна групової балачки"
 
-#: ../src/conversation_textview.py:724
-#, fuzzy
+#: ../src/conversation_textview.py:737
 msgid "_Quote"
-msgstr "Ви_йти"
+msgstr "_Цитата"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дії для «%s»"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "Прочитати статтю у В_ікіпедії"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "Пошукати це у _словнику"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, 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:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адресі URL для пошуку у Тенетах не вказано «%s»"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "Пошук у _Тенетах"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "Відкрити як _посилання"
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "Вчора"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i днів тому"
+msgid_plural "%i days ago"
+msgstr[0] "Вчора"
+msgstr[1] "Вчора"
+msgstr[2] "Вчора"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 msgid "Jabber ID already in list"
 msgstr "Ідентифікатор Jabber вже є у списку"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "Введений вами ідентифікатор Jabber вже є у списку. Оберіть якийсь інший."
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Назва контакту: <i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "У групі"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Ім'я контакту"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Встановити настрій"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "Повідомлення про стан %s"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Повідомлення про стан"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Цю назву вже було використано. Бажаєте перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Зберегти як стандартне повідомлення про стан"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Будь ласка, введіть назву цього повідомлення про стан"
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Адреса AIM:"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Номер GG:"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Номер ICQ:"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Адреса MSN:"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Адреса Yahoo!:"
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Будь ласка, вкажіть дані контакту, який ви бажаєте додати до облікового "
 "запису %s"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Будь ласка, вкажіть дані контакту, який ви бажаєте додати"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "Некоректний ідентифікатор користувача"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "У ідентифікаторі користувача не повинно міститися назви ресурсу."
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 msgid "You cannot add yourself to your roster."
 msgstr "Ви не можете додавати себе ж до реєстру."
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "Цей контакт вже є у реєстрі"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "Цей контакт уже є у вашому реєстрі."
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "Ідентифікатор:"
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "Клієнт Jabber на GTK+"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "Поточні розробники:"
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "Колишні розробники:"
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "ПОДЯКИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Нарешті, але ані трохи не менше, ми вдячні всім супровідникам пакунків з "
 "програмою."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr "Raven's fans <translation@linux.org.ua>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6812,104 +6787,109 @@ msgstr ""
 "\n"
 "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 msgid "The nickname has not allowed characters."
 msgstr "У псевдонімі є недозволені символи."
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запит на підписку до облікового запису %(account)s від %(jid)s"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запит на підписку від %s"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ви вже берете участь у груповій балачці %s"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Приєднатися до групової балачки з облікового запису %s"
 
-#: ../src/dialogs.py:2050
-#, fuzzy
+#: ../src/dialogs.py:2160
 msgid "Invalid Account"
-msgstr "Некоректна назва облікового запису"
+msgstr "Некоректний обліковий запис"
 
-#: ../src/dialogs.py:2051
-#, fuzzy
+#: ../src/dialogs.py:2161
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
-msgstr "Обліковий запис, з якого ви бажаєте увійти до кімнати"
+msgstr ""
+"Ви маєте обрати обліковий запис, з якого ви бажаєте приєднатись до групової "
+"балачки."
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 msgid "Invalid Nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber групової балачки"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr ""
+"У ідентифікаторі Jabber групової балачки містяться недозволені символи."
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "Це не групова балачка"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не є назвою групової балачки."
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 "Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
 "запису з сервером."
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 msgid "This account is not connected to the server"
 msgstr "Цей обліковий запис не з’єднано з сервером"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Можливістю синхронізації можна скористатися, лише якщо обліковий запис "
 "з’єднано з сервером."
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Почати балачку з облікового запису %s"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "Почати балачку"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6918,300 +6898,326 @@ msgstr ""
 "бажаєте надіслати повідомлення балачки:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "Некоректний JID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не вдалося обробити «%s»."
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "До встановлення з’єднання ви не зможете змінити ваш пароль."
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "Некоректний пароль"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "Вам слід ввести пароль."
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "Нове повідомлення"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "Створити окреме повідомлення"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "Нове повідомлення електронної пошти"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "Завершення передавання файла"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "Запрошення до групової балачки"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Окреме повідомлення з використанням облікового запису %s"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Окреме повідомлення для облікового запису %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "Окреме повідомлення"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "Надіслати %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "Отримано %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, 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:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "Відповідь: %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "Сумний"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "Змінити"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "В_илучити"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
-msgstr "Я хочу додати вас до мого списку контактів."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr "<b>%s</b> бажає додати вас до <b>%s</b> контактів у своєму реєстрі."
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
-msgstr ""
+msgstr "Додати"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
-#, fuzzy
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 msgid "Modify"
-msgstr "Смутний"
+msgstr "Змінити"
 
-#: ../src/dialogs.py:2888
-#, fuzzy
+#: ../src/dialogs.py:3011
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2894
-#, fuzzy
+#: ../src/dialogs.py:3017
 msgid "Groups"
-msgstr "Група"
+msgstr "Групи"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
-#, fuzzy, python-format
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "Я хочу додати вас до свого реєстру."
+msgstr "%s підказав мені додати вас до мого реєстру."
+
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "Дод_ати контакт"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "Вилучає контакт з реєстру"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Списки конфіденційності <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, 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:3173
+#: ../src/dialogs.py:3294
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Порядок: %(order)s, дія: %(action)s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редагувати правило</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додати правило</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "Некоректна назва списку"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 msgid "You are invited to a groupchat"
 msgstr "Вас запрошено до групової балачки"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запросив вас до участі у обговоренні"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запросив вас до групової балачки %(room_jid)s"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr "Чи бажаєте ви прийняти це запрошення?"
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "Обрати звук"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "Всі файли"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Звуки wav"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "Вибрати зображення"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "Зображення"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "Якщо %s стане рівним:"
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавання особливого сповіщення для %s"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "якщо я "
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7222,19 +7228,19 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання (SAS) цього сеансу є <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr "Ви вже перевіряли особу контакту."
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr "Особу контакту перевірено"
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr "Повторити перевірку..."
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 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 "
@@ -7244,19 +7250,19 @@ msgstr ""
 "бажана особа, і що ця лише ця особа матиме змогу надсилати вам повідомлення, "
 "вам слід підтвердити їх ідентичність натисканням кнопки, розташованої нижче."
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr "Особу контакту НЕ перевірено"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr "Перевірити..."
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr "Чи перевірили ви особу контакту?"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7271,24 +7277,24 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання у цьому сеансі буде <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Ви зв’язалися з контактом і перевірили SAS?"
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, 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:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 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."
@@ -7297,7 +7303,7 @@ msgstr ""
 "b>, отже повідомлення <b>не може</b> бути зашифрованим. Для того, щоб "
 "встановити надійність цього ключа, скористайтесь вашим клієнтом GPG."
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7305,6 +7311,25 @@ msgstr ""
 "З цим контактом пов’язано ключ GPG, ви вважаєте цей ключ надійним, отже "
 "повідомлення буде зашифровано."
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "Інші"
@@ -7314,25 +7339,25 @@ msgstr "Інші"
 msgid "Conference"
 msgstr "Конференція"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Для того, щоб переглядати доступні служби, вам слід встановити з’єднання"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук служб за допомогою облікового запису %s"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "Пошук у службі"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "Не вдалося знайти службу"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7340,237 +7365,236 @@ msgstr ""
 "За вказаною вами адресою служб не виявлено, або ця адреса не відповідає. "
 "Перевірте, чи правильно вказано адресу, а потім повторіть спробу."
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "Служба не придатна для перегляду"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "Служби такого типу не містять елементів, які можна було б переглядати."
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 msgid "Invalid Server Name"
 msgstr "Некоректна назва сервера"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Перегляд %(address)s з використанням облікового запису %(account)s"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "_Перегляд"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "Ця служба не містить жодних елементів, які можна було б переглядати."
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 msgid "_Execute Command"
 msgstr "Ви_конати команду"
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "За_реєструватися"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "Користувачі"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "Опис"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Ідентифікатор"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "Закладку вже встановлено"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Закладка на груповій балачці «%s» вже існує."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "Закладку було успішно додано"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "Підписано"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 msgid "Node"
 msgstr "Вузол"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "Нове повідомлення"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "_Підписатися"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "_Скасувати підписку"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr "Помилка сертифіката SSL"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Бібліотека, призначена для перевірки сертифікатів сервера, які забезпечують "
 "безпеку з’єднання."
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Потрібен python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Балачка, для якої не потрібен сервер, з автоматичним виявленням клієнтів у "
 "локальній мережі."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr "Потрібен python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Потрібен pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 msgid "Command line"
 msgstr "Команди:·%s"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипт для керування Gajim за допомогою командного рядка."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr "Потрібен python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr "Цією можливістю не можна скористатися у Windows."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 msgid "OpenGPG message encryption"
 msgstr "Вибір ключа OpenPGP"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Шифрування повідомлень балачки за допомогою ключів gpg."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Потрібні gpg і python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr "Автоматичне визначення стану мережі."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Потрібні gnome-network-manager і python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Session Management"
 msgstr "Керування сеансами"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "Збереження сеансу Gajim під час завершення роботи у системі і відновлення "
 "сеансу після входу до системи."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr "Потрібен python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 msgid "Password encryption"
 msgstr "Пароль для входу до кімнати"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Можна зберігати паролі безпечно, не як звичайний текст."
 
-#: ../src/features_window.py:72
-#, fuzzy
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Потрібні gnome-keyring і python-gnome2-desktop."
+msgstr "Потрібні gnome-keyring і python-gnome2-desktop, або kwalletcli."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Можливість з’єднання з серверами, які використовують записи SRV."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr "Потребує dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr "Для використання SRV-записів потрібен nslookup."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr "Перевірка правопису"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr "Перевірка правопису повідомлень, які ви створюєте."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr "Потрібна бібліотека libxss."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 msgid "Notification"
 msgstr "Сповіщення"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr "Контекстні виринаючі вікна для нових подій."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7578,52 +7602,33 @@ msgstr ""
 "Потрібен пакунок python-notify або його замінник: python-dbus разом з "
 "фоновою службою сповіщення (notification-daemon)."
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr "Піктограма лотка"
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr "Піктограма у системному лотку показує поточний стан присутності."
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Потрібен пакунок python-gnome2-extras або модуль піктограми лотка "
-"(trayicon), зібраний з початкових кодів Gajim."
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr "Потрібний PyGTK >= 2.10."
-
-#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "_Узгодити зі станом"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Можливість вимірювання часу відсутності активності для встановлення "
 "автоматичного стану."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr "Потрібна бібліотека libxss."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr "Потрібен python2.5."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Перетворення виразів LaTeX, обмежених позначками $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
@@ -7631,7 +7636,7 @@ msgstr ""
 "Потрібні пакунки texlive-latex-base і dvipng. Крім того, вам слід вказати "
 "для параметра «use_latex» значення «True» у Редакторі додаткових налаштувань."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7640,23 +7645,23 @@ msgstr ""
 "також слід встановити для параметра «use_latex» значення «True» у Редакторі "
 "додаткових налаштувань."
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 msgid "End to End message encryption"
 msgstr "Шифрування E2E"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 msgid "Encrypting chat messages."
 msgstr "Шифрування повідомлень балачки."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Потрібен пакунок python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 msgid "RST Generator"
 msgstr "Інструмент створення RST"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7664,25 +7669,38 @@ msgstr ""
 "Створення XHTML з коду RST (див. http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Потрібні python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr "Банери та активні посилання"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Можливість користуватися натисканням адрес URL у підписах вікон балачки і "
 "групової балачки."
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr "Потрібен python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+#, fuzzy
+msgid "Requires python-farsight."
+msgstr "Потрібен python-avahi."
+
+#: ../src/features_window.py:125
 msgid "Feature"
 msgstr "Можливість"
 
@@ -7698,140 +7716,139 @@ msgstr "Час"
 msgid "Progress"
 msgstr "Поступ"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "Назва файла: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Розмір: %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "Ви"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "Відправник: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "Отримувач:"
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Збережено за адресою: %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "Передавання файла завершено"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 msgid "File transfer cancelled"
 msgstr "Передавання файла скасовано"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "Не вдалося встановити з’єднання з вузлом."
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "Отримувач: %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "Повідомлення про помилку: %s"
 
-#: ../src/filetransfers_window.py:231
-#, fuzzy
+#: ../src/filetransfers_window.py:237
 msgid "File transfer stopped"
 msgstr "Зупинка передавання файла"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "Вибрати файл для надсилання..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 msgid "Description: "
 msgstr "Опис: "
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim не може отримати доступу до цього файла"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "Цей файл використовується іншим процесом."
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s бажає надіслати вам файл:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не вдалося перезаписати існуючий файл «%s»"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 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:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "Файл з такою назвою вже існує."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Запис до каталогу «%s» неможливий"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "Ваш користувач не має права на створення файлів у цьому каталозі."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7839,32 +7856,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Некоректний файл"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "Надсилання порожніх файлів не передбачено"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "Назва: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "Відправник:"
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "Призупинити"
 
@@ -7875,29 +7892,25 @@ msgstr "Для роботи Gajim потрібен запущений серве
 #: ../src/gajim.py:141
 #, python-format
 msgid "importing PyGTK failed: %s"
-msgstr ""
+msgstr "імпорт PyGTK не вдався: %s"
 
 #: ../src/gajim.py:180
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Для роботи Gajim потрібен PyGTK 2.8 або новіша версія"
+msgstr "Для роботи Gajim потрібен PyGTK 2.12 або новіша версія"
 
 #: ../src/gajim.py:181
-#, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
-"Для запуску Gajim потрібен PyGTK 2.8 або новіша версія. Завершення роботи..."
+"Для запуску Gajim потрібен PyGTK 2.12 або новіша версія. Завершення роботи..."
 
 #: ../src/gajim.py:183
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
-msgstr "Для роботи Gajim потрібна бібліотека GTK 2.8 або новіша версія"
+msgstr "Для роботи Gajim потрібна бібліотека GTK 2.12 або новіша версія"
 
 #: ../src/gajim.py:184
-#, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr ""
-"Для запуску Gajim потрібна бібліотека GTK 2.8 або новіша версія. Завершення "
+"Для запуску Gajim потрібна бібліотека GTK 2.12 або новіша версія. Завершення "
 "роботи..."
 
 #: ../src/gajim.py:189
@@ -7938,11 +7951,11 @@ msgstr ""
 "Звантажити цю програму можна за адресою %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim вже запущено"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7950,463 +7963,29 @@ msgstr ""
 "Здається, вже запущено інший екземпляр Gajim.\n"
 "Запустити ще один екземпляр?"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "Слід вказати пароль"
-
-#: ../src/gajim.py:441
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr "Немає ключа GPG"
-
-#: ../src/gajim.py:456
-#, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "З’єднання з %s буде встановлено без OpenPGP."
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "Вказано помилковий пароль"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr ""
-"Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
-
-#: ../src/gajim.py:524
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Псевдонім у груповій балачці %s, який ви бажали використати, вже "
-"використовує інший учасник.\n"
-"Будь ласка, вкажіть нижче інший псевдонім:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "Чи приймаєте ви цей запит?"
-
-#: ../src/gajim.py:546
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
-
-#: ../src/gajim.py:549
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "Спроба з’єднання завершилася невдало"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Помилка %(code)s: %(msg)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "помилка під час надсилання %(message)s ( %(error)s )"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-msgid "Subscription request"
-msgstr "Запит на підписку"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "Уповноваження прийнято"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Контакт «%s» вилучив вашу підписку"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-"Цей контакт завжди буде показано зі станом «поза мережею».\n"
-"Бажаєте вилучити контакт з вашого списку контактів?"
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-msgid "Unsubscribed"
-msgstr "_Непідписаний"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Зв’язок з «%s» встановити не вдалося"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s тепер стає %(new_nick)s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s тепер %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s встановив тему %(subject)s"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Всі учасники можуть бачити ваш JID повністю"
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Сталася зміна налаштувань кімнати, не пов’язана з конфіденційністю"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr "Тепер увімкнено запис повідомлень кімнати"
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr "Тепер запис кімнати вимкнено"
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr "Тепер у кімнаті вимкнено анонімність"
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr "Тепер у кімнаті увімкнено напіванонімність"
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr "Тепер у кімнаті увімкнено анонімність"
-
-#: ../src/gajim.py:1492
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
-"або цей агент повернув помилковий пароль.\n"
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "Ваш пароль не є коректним"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "Ваш пароль не є коректним"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr "GPG непридатне для використання"
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-"З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
-"буде неможливим."
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "Більше _не питати мене"
-
-#: ../src/gajim.py:1571
-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неправильно)"
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Нові повідомлення у %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Отримано %d новий лист"
-msgstr[1] "Отримано %d нових листи"
-msgstr[2] "Отримано %d нових листів"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-"\n"
-"\n"
-"Від: %(from_address)s\n"
-"Тема: %(subject)s\n"
-"%(snippet)s"
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s бажає надіслати вам файл."
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Вилучає контакт з реєстру"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "Помилка під час спроби прочитати файл:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Ви успішно отримали %(filename)s від %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Ви успішно надіслали %(filename)s до %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Не вдалося розшифрувати повідомлення від %s\n"
-"Можливо, хтось втрутився у ваше з’єднання."
-
-#: ../src/gajim.py:1968
-msgid "Unable to decrypt message"
-msgstr "Не вдалося розшифрувати повідомлення"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "Конфлікт імен користувачів"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr ""
-"Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
-"запису"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr "Гу?"
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Га! (%s s.)"
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr "Помилка."
-
-#: ../src/gajim.py:2106
-msgid "Resource Conflict"
-msgstr "Конфлікт ресурсів"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
-"ласка, вкажіть інший ресурс"
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr "Помилка під час перевірки сертифіката SSL"
-
-#: ../src/gajim.py:2167
-#, 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 ""
-"Під час спроби перевірки сертифіката SSL вашого сервера jabber сталася "
-"помилка: %(error)s\n"
-"Ви все ще маєте намір з’єднатися з сервером?"
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr "Ігнорувати цю помилку для цього сертифіката."
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr "Помилка сертифіката SSL"
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-"Здається сертифікат SSL облікового запису  %(account)s було змінено або "
-"хтось втрутився у ваше з’єднання.\n"
-"Старий відбиток: %(old)s\n"
-"Новий відбиток: %(new)s\n"
-"\n"
-"Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-msgid "Insecure connection"
-msgstr "Небезпечне з’єднання"
-
-#: ../src/gajim.py:2224
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr ""
-"Ви маєте намір надіслати ваш пароль нешифрованим з’єднанням. Виконати "
-"надсилання пароля?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr "Так, я справді бажаю знехтувати безпекою"
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-"Ви маєте намір надіслати ваш пароль незахищеним з’єднанням. Щоб покращити "
-"безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
-"зараз?"
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr "Вузол повідомлення про стан було вилучено"
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-msgid "Emoticons disabled"
-msgstr "Емоційки вимкнено"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-"Не вдалося завантажити вказану вами тему емоційок. Можливо, вам слід оновити "
-"формат файла emoticons.py. Докладніше про новий формат можна дізнатися за "
-"адресою http://trac.gajim.org/wiki/Emoticons."
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Ви не можете приєднуватися до групової балачки зі станом «невидимий»"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "Не вдалося зберегти ваші налаштування і параметри"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Показує довідку щодо вказаної команди"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "показати довідку щодо команди"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Вмикає або вимикає показ вікна реєстру"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr ""
 "Відкриває контекстне вікно з повідомленням про наступну заплановану подію"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8414,49 +7993,49 @@ msgstr ""
 "Показує список всіх контактів з реєстру. Кожен з записів контактів буде "
 "показано у окремому рядку"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "обліковий запис"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "показати лише контакти вказаного облікового запису"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Показує список зареєстрованих облікових записів"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Змінює стан облікового запису або обліковий запис"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "стан"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "одне зі значень: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "повідомлення"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "повідомлення про стан"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8465,51 +8044,47 @@ msgstr ""
 "вказано, спробувати змінити стан всіх облікових записів, для яких було "
 "позначено пункт «синхронізувати з загальним станом»"
 
-#: ../src/gajim-remote.py:118
-#, fuzzy
+#: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
-msgstr "Змінює стан облікового запису або обліковий запис"
+msgstr "Змінює пріоритет одного або кількох облікових записів"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority"
-msgstr "Пріорите_т:"
+msgstr "пріоритет"
 
-#: ../src/gajim-remote.py:120
-#, fuzzy
+#: ../src/gajim-remote.py:119
 msgid "priority you want to give to the account"
-msgstr "Я бажаю _зареєструвати новий обліковий запис"
+msgstr "пріоритет який ви бажаєте надати обліковому запису"
 
-#: ../src/gajim-remote.py:122
-#, fuzzy
+#: ../src/gajim-remote.py:121
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"змінити стан облікового запису «account». Якщо назви облікового запису не "
-"вказано, спробувати змінити стан всіх облікових записів, для яких було "
+"змінити пріоритет вказаного облікового запису. Якщо назви облікового запису "
+"не вказано, спробувати змінити стан всіх облікових записів, для яких було "
 "позначено пункт «синхронізувати з загальним станом»"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Відкриває діалогове вікно балачки, за допомогою якого ви зможете надсилати "
 "повідомлення контакту"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакту, з яким ви бажаєте розпочати балачку"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "якщо вказано, контакт буде взято зі списку контактів цього облікового запису"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
-msgstr ""
+msgstr "вміст повідомлення. Обліковий запис має бути зазначено або \"\""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8520,29 +8095,29 @@ msgstr ""
 "лише 'account', без 'OpenPGP key', просто встановіть значення 'OpenPGP key' "
 "рівним ''."
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакту, який отримає це повідомлення"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "вміст повідомлення"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "ключ pgp"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "якщо вказано, повідомлення буде зашифровано відкритим ключем"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "якщо вказано, повідомлення буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8553,138 +8128,138 @@ msgstr ""
 "лише 'account', без 'OpenPGP key', просто встановіть значення 'OpenPGP key' "
 "рівним ''."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тема повідомлення"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Надсилає нове повідомлення до групової балачки, до якої ви приєдналися."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID кімнати, де буде отримано це повідомлення"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID контакту"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Назва облікового запису"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Надсилає контакту файл"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Шлях до файла"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "якщо вказано, файл буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Показує список всі параметрів та значення цих параметрів"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Встановлює значення «ключ» у «значення»"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ключ=значення"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "«ключ» — це назва параметра, «значення» — значення параметра"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Вилучає запис параметра"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "назва параметра, який буде вилучено"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записує поточні значення параметрів Gajim до файла .config"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Вилучає контакт з реєстру"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Додає контакт до реєстру"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Додає новий контакт до цього облікового запису"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Повертає поточний стан (загальний стан, якщо не було вказано облікового "
 "запису)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Повертає поточне повідомлення стану (загальне повідомлення, якщо не було "
 "вказано облікового запису)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Повертає кількість непрочитаних повідомлень"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Відкриває діалогове вікно «Почати балачку»"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Розпочати балачку з цього облікового запису"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Надсилає нетиповий XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML для надсилання"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8692,72 +8267,71 @@ msgstr ""
 "Обліковий запис, на який буде надіслано xml; якщо не вказано, xml буде "
 "надіслано до всіх облікових записів"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr "Обробка xmpp:/ uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr "Адреса URI для обробки"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr "Обліковий запис, який має це обробляти"
 
-#: ../src/gajim-remote.py:274
-#, fuzzy
+#: ../src/gajim-remote.py:273
 msgid "Message content"
-msgstr "вміст повідомлення"
+msgstr "Вміст повідомлення"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 msgid "Join a MUC room"
 msgstr "Приєднатися до кімнати групової балачки"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "room"
 msgstr "кімната"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Room JID"
 msgstr "JID кімнати"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "nick"
 msgstr "псевдонім"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 msgid "Nickname to use"
 msgstr "Псевдонім, який слід використовувати"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 msgid "Password to enter the room"
 msgstr "Пароль для входу до кімнати"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr "Обліковий запис, з якого ви бажаєте увійти до кімнати"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 msgid "Check if Gajim is running"
 msgstr "Перевірити, чи запущено Gajim"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 msgid "Shows or hides the ipython window"
 msgstr "Показує або ховає вікно ipython"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущено аргумент «contact_jid»"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8766,16 +8340,16 @@ msgstr ""
 "«%s» немає у реєстрі.\n"
 "Будь ласка, вкажіть обліковий запис для надсилання цього повідомлення."
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "У вас немає жодного задіяного облікового запису"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Здається, Gajim не запущено. Отже ви не зможете скористатися gajim-remote."
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8784,16 +8358,16 @@ msgstr ""
 "Використання: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr "%s не знайдено"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8802,7 +8376,7 @@ msgstr ""
 "Використання: %s команда [аргументи]\n"
 "Можливі команди:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8811,7 +8385,7 @@ msgstr ""
 "Забагато аргументів. \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8820,7 +8394,7 @@ msgstr ""
 "Не було вказано аргумент \"%(arg)s\". \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 msgid "Wrong uri"
 msgstr "Помилкова адреса uri"
 
@@ -8849,151 +8423,175 @@ msgstr "Ви не можете вилучати вашої поточної те
 msgid "Please first choose another for your current theme."
 msgstr "Будь ласка, спершу змініть тему на іншу."
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "Спроба надсилання конфіденційного повідомлення зазнала невдачі"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Ви полишили групову балачку «%(room)s» або це зробив (зробила) «%(nick)s»."
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "Вставити псевдонім"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 msgid "Conversation with "
 msgstr "Спілкування з"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 msgid "Continued conversation"
 msgstr "Спілкування з продовженням"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Всі учасники можуть бачити ваш JID повністю"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr "Увімкнено запис кімнати"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 msgid "A new room has been created"
 msgstr "Було створено нову кімнату"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер призначив вам псевдонім у кімнаті або змінив цей псевдонім"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s було викинуто: %(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, 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:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s було заблоковано: %(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s було заблоковано %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s тепер стає %(new_nick)s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 msgid "affiliation changed"
 msgstr "змінено місце роботи"
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr "налаштування кімнати змінено на «лише для постійних учасників»"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr "вимкнення системи"
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, 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:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Належність of %(nick)s було встановлено у значення %(affiliation)s"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, 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:1400
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr "%s вийшов"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s тепер %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "Більше _не питати мене"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "Зміна теми"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "Будь ласка, вкажіть нову тему:"
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "Зміна псевдоніма"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, python-format
 msgid "Destroying %s"
 msgstr "Знищення %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9001,22 +8599,22 @@ msgstr ""
 "Ви маєте намір знищити цю кімнату.\n"
 "Нижче ви можете вказати причину цього рішення:"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "Викидання %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "Нижче ви можете зазначити причину:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "Блокування %s"
@@ -9041,60 +8639,477 @@ msgid "Details"
 msgstr "Подробиці"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Помилка: не вдалося відкрити %s для читання"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "Помилка під час спроби прочитати файл:"
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "Помилка під час обробки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Не вдалося виконати запис до %s. Підтримка керування сеансами не працюватиме"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не є типовим клієнтом Jabber"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Чи бажаєте ви зробити Gajim типовим клієнтом Jabber?"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Завжди перевіряти, чи є Gajim типовим клієнтом Jabber, під час запуску"
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "Додаток не підтримується"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Зображення не може бути збережено у форматі %(type)s. Зберегти як %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "Зберегти зображення як..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Псевдонім у груповій балачці %s, який ви бажали використати, вже "
+"використовує інший учасник.\n"
+"Будь ласка, вкажіть нижче інший псевдонім:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr "Завжди використовувати цей псевдонім при виникненні конфліктів."
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "Чи приймаєте ви цей запит?"
+
+#: ../src/gui_interface.py:151
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
+
+#: ../src/gui_interface.py:154
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "Спроба з’єднання завершилася невдало"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Помилка %(code)s: %(msg)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "помилка під час надсилання %(message)s ( %(error)s )"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+msgid "Subscription request"
+msgstr "Запит на підписку"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "Уповноваження прийнято"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Контакт «%s» вилучив вашу підписку"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+"Цей контакт завжди буде показано зі станом «поза мережею».\n"
+"Бажаєте вилучити контакт з вашого списку контактів?"
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+msgid "Unsubscribed"
+msgstr "_Непідписаний"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Зв’язок з «%s» встановити не вдалося"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr "%(jid)s встановив тему %(subject)s"
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "Сталася зміна налаштувань кімнати, не пов’язана з конфіденційністю"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr "Тепер увімкнено запис повідомлень кімнати"
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr "Тепер запис кімнати вимкнено"
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr "Тепер у кімнаті вимкнено анонімність"
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr "Тепер у кімнаті увімкнено напіванонімність"
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr "Тепер у кімнаті увімкнено анонімність"
+
+#: ../src/gui_interface.py:1103
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
+"Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
+"або цей агент повернув помилковий пароль.\n"
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "Ваш пароль не є коректним"
+
+#: ../src/gui_interface.py:1144
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Ваш OpenPGP пароль не є коректним"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr "GPG непридатне для використання"
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
+"буде неможливим."
+
+#: ../src/gui_interface.py:1182
+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неправильно)"
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Нові повідомлення у %(gmail_mail_address)s"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Отримано %d новий лист"
+msgstr[1] "Отримано %d нових листи"
+msgstr[2] "Отримано %d нових листів"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+"\n"
+"\n"
+"Від: %(from_address)s\n"
+"Тема: %(subject)s\n"
+"%(snippet)s"
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s бажає надіслати вам файл."
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+msgid "Remote contact stopped transfer"
+msgstr "Віддалений контакт зупинив передавання файлу"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+msgid "Error opening file"
+msgstr "Помилка під час спроби прочитати файл"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Ви успішно отримали %(filename)s від %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Ви успішно надіслали %(filename)s до %(name)s."
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Не вдалося розшифрувати повідомлення від %s\n"
+"Можливо, хтось втрутився у ваше з’єднання."
+
+#: ../src/gui_interface.py:1583
+msgid "Unable to decrypt message"
+msgstr "Не вдалося розшифрувати повідомлення"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "Конфлікт імен користувачів"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr ""
+"Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
+"запису"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr "Гу?"
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Га! (%s s.)"
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr "Помилка."
+
+#: ../src/gui_interface.py:1721
+msgid "Resource Conflict"
+msgstr "Конфлікт ресурсів"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
+"ласка, вкажіть інший ресурс"
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s бажає надіслати вам файл."
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "Запит на передавання файла"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr "Помилка під час перевірки сертифіката SSL"
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+"Під час спроби перевірки сертифіката SSL вашого сервера jabber сталася "
+"помилка: %(error)s\n"
+"Ви все ще маєте намір з’єднатися з сервером?"
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr "Ігнорувати цю помилку для цього сертифіката."
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr "Помилка сертифіката SSL"
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+"Здається сертифікат SSL облікового запису  %(account)s було змінено або "
+"хтось втрутився у ваше з’єднання.\n"
+"Старий відбиток: %(old)s\n"
+"Новий відбиток: %(new)s\n"
+"\n"
+"Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+msgid "Insecure connection"
+msgstr "Небезпечне з’єднання"
+
+#: ../src/gui_interface.py:1937
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Ви маєте намір надіслати ваш пароль нешифрованим з’єднанням. Виконати "
+"надсилання пароля?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr "Так, я справді бажаю знехтувати безпекою"
+
+#: ../src/gui_interface.py:1972
+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 ""
+"Ви маєте намір надіслати ваш пароль незахищеним з’єднанням. Щоб покращити "
+"безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
+"зараз?"
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr "Вузол повідомлення про стан було вилучено"
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+msgid "Emoticons disabled"
+msgstr "Емоційки вимкнено"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
+
+#: ../src/gui_interface.py:2570
+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 ""
+"Не вдалося завантажити вказану вами тему емоційок. Можливо, вам слід оновити "
+"формат файла emoticons.py. Докладніше про новий формат можна дізнатися за "
+"адресою http://trac.gajim.org/wiki/Emoticons."
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+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/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "Не вдалося зберегти ваші налаштування і параметри"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "Слід вказати пароль"
+
+#: ../src/gui_interface.py:3463
+#, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr "Немає ключа GPG"
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "З’єднання з %s буде встановлено без OpenPGP."
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "Вказано помилковий пароль"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr ""
+"Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
+
+#: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Створити групову балачку"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "Я хочу додати вас до свого реєстру"
 
@@ -9109,7 +9124,7 @@ msgstr "Контакти"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "Дата"
 
@@ -9120,7 +9135,7 @@ msgstr "Псевдонім"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "Повідомлення"
 
@@ -9147,241 +9162,243 @@ msgstr ""
 "\n"
 "Якщо ви натиснете кнопку «ТАК», вам доведеться зачекати..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "Експорт журналів..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s повідомив: %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "Ви справді бажаєте вилучити журнали для виділеного контакту?"
 msgstr[1] "Ви справді бажаєте вилучити журнали для виділених контактів?"
 msgstr[2] "Ви справді бажаєте вилучити журнали для виділених контактів?"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "Наслідки цієї дії є незворотними."
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ви справді бажаєте вилучити виділене повідомлення?"
 msgstr[1] "Ви справді бажаєте вилучити виділені повідомлення?"
 msgstr[2] "Ви справді бажаєте вилучити виділені повідомлення?"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал спілкування з %s"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Помилка роботи з диском"
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s тепер %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
-#, fuzzy, python-format
+#: ../src/history_window.py:449
+#, python-format
 msgid "Error: %s"
-msgstr "Повідомлення про помилку: %s"
+msgstr "Помилка: %s"
 
-#: ../src/history_window.py:440
-#, fuzzy
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr "Помилка."
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Поточний стан: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Поточний стан: %(status)s"
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 msgid "Timeout loading image"
 msgstr "Перевищення часу очікування під час завантаження зображення"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr "Зображення є завеликим"
 
-#: ../src/message_window.py:220
-#, fuzzy
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
-msgstr "Ваш комп’ютер не з’єднано з сервером"
+msgstr "Ви збираєтесь закрити кілька вкладок"
 
-#: ../src/message_window.py:221
-#, fuzzy
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
-msgstr "Ви справді бажаєте вилучити виділене повідомлення?"
+msgstr "Ви справді бажаєте закритити їх усі?"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "Балачки"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "Групові балачки"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "Конфіденційні балачки"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- вестиметься запис повідомлень"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- не вестиметься запис повідомлень"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змінив стан"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s в мережі"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s вийшов з мережі"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нове окреме повідомлення від %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нове конфіденційне повідомлення з групової балачки %s"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Повідомлення надіслано від імені %(nickname)s"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нове повідомлення від %(nickname)s"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 msgid "Ignore"
 msgstr "_Ігнорувати"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "Отримання профілю..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 msgid "File is empty"
 msgstr "Файл порожній"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 msgid "File does not exist"
 msgstr "Файла не існує"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "Отримано відомості"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Для того, щоб оприлюднити відомості щодо контакту з вами, вам слід "
 "встановити з’єднання."
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "Надсилання профілю..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "Відомості НЕ оприлюднено"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "Спроба оприлюднення vCard зазнала невдачі"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Під час спроби оприлюднення ваших особистих відомостей, спробуйте пізніше."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "Було надіслано уповноваження"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "Уповноваження було вилучено"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr "GPG непридатне для використання"
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "З’єднання з %s буде встановлено без OpenPGP."
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "Ви берете участь у одній або декількох групових балачках"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9389,28 +9406,27 @@ msgstr ""
 "Зміна стану на «невидимий» призведе до вашого виходу з наведених групових "
 "балачок. Ви справді бажаєте змінити стан на «невидимий»?"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr "розсинхронізація"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
-msgstr ""
+msgstr "Справді вийти з Gajim?"
 
-#: ../src/roster_window.py:2258
-#, fuzzy
+#: ../src/roster_window.py:2237
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
+msgstr "Ви справді бажаєте вийти з Gajim?"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
-msgstr ""
+msgstr "Завжди закривати Gajim"
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9418,16 +9434,16 @@ msgstr ""
 "Доступ для читання повідомлень буде можливим, лише якщо ви увімкнули журнал, "
 "а контакт наявний у вашому реєстрі."
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "Вам слід прочитати їх, перш ніж вилучати цей транспорт."
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" буде вилучено"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9435,11 +9451,11 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цього транспорту."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "Транспорти буде вилучено"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9448,68 +9464,69 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цих транспортів: %s"
 
-#: ../src/roster_window.py:2662
-#, fuzzy
+#: ../src/roster_window.py:2653
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
+"Цей контакт буде бачити вас як \"поза мережею\" та ви не будете отримувати "
+"від нього повідомлень."
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "Перейменувати контакт"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введіть новий псевдонім для контакту %s"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "Перейменувати групу"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введіть нову назву для групи %s"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "Вилучити групу"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Бажаєте вилучити групу %s з реєстру?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "Призначити ключ OpenPGP"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "Оберіть ключ для використання з цим контактом"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Ви збираєтесь вилучити \"%(name)s\" (%(jid)s) з вашого реєстру.\n"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9518,11 +9535,11 @@ msgstr ""
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9530,16 +9547,16 @@ msgstr ""
 "Вилучення цього контакту призведе до вилучення уповноваження, отже він або "
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9549,34 +9566,35 @@ msgstr ""
 "призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся "
 "поза мережею."
 
-#: ../src/roster_window.py:3286
-#, fuzzy
+#: ../src/roster_window.py:3295
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
-msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
+msgstr "Ви маєте намір надіслати особливий статус. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
+"Цей контакт тимчасово бачитиме вас як %(status)s, но лише до зміни вашого "
+"статусу. Потім він бачитиме ваш глобальний статус."
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
 "обліковий запис."
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9584,12 +9602,12 @@ msgstr ""
 "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
 "відомості не буде збережено до наступного з’єднання."
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 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 "
@@ -9599,11 +9617,11 @@ msgstr ""
 "списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
 "є особа з декількома обліковими записами або транспортами Jabber."
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9611,172 +9629,171 @@ msgstr[0] "Ви справді бажаєте надіслати цей файл
 msgstr[1] "Ви справді бажаєте надіслати ці файли до %s:"
 msgstr[2] "Ви справді бажаєте надіслати ці файли до %s:"
 
-#: ../src/roster_window.py:4207
-#, fuzzy, python-format
+#: ../src/roster_window.py:4227
+#, python-format
 msgid "Send %s to %s"
-msgstr "Надіслати %s"
+msgstr "Надіслати %s до %s"
 
-#: ../src/roster_window.py:4213
-#, fuzzy, python-format
+#: ../src/roster_window.py:4233
+#, python-format
 msgid "Make %s and %s metacontacts"
-msgstr "Надсилає контакту файл"
+msgstr "Робить %s та %s метаконтактом."
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "з облікового запису %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "до облікового запису %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "з облікового запису %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "_Керування закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "облікового запису %s"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "до облікового запису %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 msgid "Configure Services..."
 msgstr "Налаштувати служби..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "Редагувати _групи"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 msgid "Send Single Message"
 msgstr "Надіслати окреме повідомлення"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 msgid "_Manage Transport"
 msgstr "_Керування транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "Пере_йменувати"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: ../src/roster_window.py:5631
-#, fuzzy
+#: ../src/roster_window.py:5554
 msgid "_Reconnect"
-msgstr "_Роз'єднати"
+msgstr "_Перез’єднати"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 msgid "_Disconnect"
 msgstr "_Роз'єднати"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "_Приєднатись до нової групової балачки"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "Змінити повідомлення про стан..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr "Очікування на результати"
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Помилка у отриманих даних"
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Результату немає"
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr "Помилка під час запису на диск"
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Підтвердити параметри цих сеансів"
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9791,7 +9808,7 @@ msgstr ""
 "\n"
 "\tЧи всі вказані параметри є прийнятними?"
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9806,116 +9823,116 @@ msgstr ""
 "\n"
 "Продовжити цей сеанс?"
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "_Змінити повідомлення про стан..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "Сховати це меню"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "Ресурс"
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s цієї групової балачки"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr " [заблоковано]"
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr " [мінімізовано]"
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "Стан: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "Попередній стан: %s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr " з %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 msgid "Connected"
 msgstr "З'єднано"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 msgid "Disconnected"
 msgstr "Роз'єднано"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "Підписка:"
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 msgid "Tune:"
 msgstr "Музика:"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "Звантажити"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "Вивантажити"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "Передано:"
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "Не розпочато"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "Зупинено"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "Призупинено"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "Заблоковано"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "Перенесення"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "Ця служба ще не надала докладних відомостей"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9923,28 +9940,28 @@ msgstr ""
 "Ця служба не може надсилати у відповідь докладні відомості.\n"
 "Причиною є застарілість або пошкодженість служби"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "Невідомий"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "Невідома"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 msgid "?Time:Unknown"
 msgstr "?Час:Невідомий"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "з %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Належність:</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9952,7 +9969,7 @@ msgstr ""
 "Цей контакт зацікавлений у ваших відомостях щодо присутності, але ви не "
 "цікавитеся відомостями щодо його або її присутності"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9960,32 +9977,87 @@ msgstr ""
 "Ви зацікавлені у відомостях щодо присутності контакту, але він або вона не "
 "цікавляться вашими відомостями"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Ви і цей контакт взаємно зацікавлені у відомостях щодо присутності одне "
 "одного"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Ви не зацікавлені у присутності контакту, а він або вона у вашій присутності"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ви очікуєте на відповідь контакту на ваш запит щодо підписки"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr "У черзі немає запитів на підписку."
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
+#~ msgid "_Incoming message:"
+#~ msgstr "_Вхідне повідомлення:"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "Повідомлення про ви_хід:"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Вузол %s, який було налаштовано вами за допомогою параметра "
+#~ "ft_add_hosts_to_send advanced записано некоректно, його буде "
+#~ "проігноровано."
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "Не було вказано пароля OpenPGP"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Щоб продовжити надсилання і отримання повідомлень, вам потрібно повторити "
+#~ "процедуру з’єднання."
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Ваш обліковий запис не з’єднано з сервером або цей обліковий запис "
+#~ "перебуває у стані невидимості. Ваше повідомлення не може бути надіслано."
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[Це повідомлення зашифровано]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i днів тому"
+
+#~ msgid "Trayicon"
+#~ msgstr "Піктограма лотка"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Піктограма у системному лотку показує поточний стан присутності."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Потрібен пакунок python-gnome2-extras або модуль піктограми лотка "
+#~ "(trayicon), зібраний з початкових кодів Gajim."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Потрібний PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Додати спеціальне _сповіщення"
 
@@ -10033,21 +10105,32 @@ msgstr " пріоритетний ресурс"
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "%(contact_jid)s запрошено до %(room_jid)s."
 
-#, fuzzy
+#~ msgid ""
+#~ "There is an ambiguity: %d nicks match.\n"
+#~ " Please use graphical interface "
+#~ msgstr ""
+#~ "Виникла неоднозначність: %d псевдонімів збігаються.\n"
+#~ "Будь ласка, скористайтесь графічним інтерфейсом"
+
 #~ msgid "Nickname not found"
-#~ msgstr "Псевдоніма не знайдено: %s"
+#~ msgstr "Псевдонім не знайдено"
+
+#~ msgid ""
+#~ "There is an ambiguity: %d nicks match.\n"
+#~ " Please use graphical interface"
+#~ msgstr ""
+#~ "Виникла неоднозначність: %d псевдонімів збігаються.\n"
+#~ "Будь ласка, скористайтесь графічним інтерфейсом"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
 #~ "If the JID is currently in the group chat, he/she/it will also be kicked."
 #~ msgstr ""
 #~ "Використання: /%s <псевдонім|JID> [причина], заблокувати JID у груповій "
-#~ "балачці. Може бути виконано заміну псевдоніма учасника, але лише, якщо "
+#~ "розмові. Може бути виконано заміну псевдоніма учасника, але лише, якщо "
 #~ "цей псевдонім не містить символів «@». Якщо особа з вказаним JID все ще "
-#~ "бере участь у груповій балачці, її буде викинуто з балачки. Пробіли у "
-#~ "псевдонімі НЕ підтримуються."
+#~ "бере участь у груповій балачці, її буде викинуто з балачки."
 
 #~ msgid ""
 #~ "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -10077,14 +10160,12 @@ msgstr " пріоритетний ресурс"
 #~ "Використання: /%s <кімната>@<сервер>[/псевдонім], приєднатися до кімнати "
 #~ "на сервері з необов’язковим вказаним псевдонімом."
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
 #~ "nickname from the group chat and optionally displays a reason."
 #~ msgstr ""
 #~ "Використання: /%s <псевдонім> [причина], вилучити учасника з вказаним "
-#~ "псевдонімом з групової балачки з необов’язковим зазначенням причини. "
-#~ "Пробіли у псевдонімах НЕ підтримуються."
+#~ "псевдонімом з групової балачки з необов’язковим зазначенням причини."
 
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -10113,13 +10194,19 @@ msgstr " пріоритетний ресурс"
 #~ "Використання: /%s <message>, надіслати повідомлення без використання "
 #~ "інших команд."
 
-#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
+#~ "messages."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім>, заблокує для <псевдонім> можливість "
+#~ "надсилати вам особисті повідомлення."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
 #~ "messages."
 #~ msgstr ""
-#~ "Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій "
-#~ "балачці."
+#~ "Використання: /%s <псевдонім>, дозволить <псевдонім> надсилати вам "
+#~ "звичайні та особисті повідомлення."
 
 #~ msgid "B_OSH Port:"
 #~ msgstr "П_орт BOSH:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7b41848b6..eb2a800b2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
 "PO-Revision-Date: 2009-08-20 00:07+0200\n"
 "Last-Translator: kangkang <kanger@gmail.com>\n"
 "Language-Team: sIyU <jabber@lzusiyu.org>\n"
@@ -290,9 +290,9 @@ msgstr "编辑个人信息..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -301,9 +301,9 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
 msgid "General"
 msgstr "常规"
 
@@ -357,21 +357,21 @@ msgid "Information about you, as stored in the server"
 msgstr "服务器中保存的关于您的信息"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
 msgid "None"
 msgstr "无"
 
@@ -527,8 +527,8 @@ msgstr ""
 "您可以考虑下改变现在的防火墙设置。"
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
 msgid "Jabber ID:"
 msgstr "Jabber ID"
 
@@ -542,7 +542,7 @@ msgid "Mer_ge accounts"
 msgstr "合并帐户(_G)"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
 msgid "Re_name"
 msgstr "重命名(_N)"
 
@@ -961,7 +961,7 @@ msgstr "名："
 msgid "New entry received"
 msgstr "当新事件发生时"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
@@ -1009,12 +1009,12 @@ msgstr "输入新密码"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>键入新的状态消息</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
 #, fuzzy
 msgid "Activity:"
 msgstr "活动"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
 #, fuzzy
 msgid "Mood:"
 msgstr "房间："
@@ -1109,8 +1109,8 @@ msgstr "编辑群组"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
@@ -1125,8 +1125,8 @@ msgid "Remo_ve"
 msgstr "移除(_R)"
 
 #. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "发送自定义 XML"
@@ -1162,8 +1162,8 @@ msgid "_Allow him/her to see my status"
 msgstr "允许他/她查看我的状态(_A)"
 
 #: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
 msgid "_Block"
 msgstr ""
 
@@ -1174,7 +1174,7 @@ msgstr "禁止他/她查看我的状态(_F)"
 #: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
 msgid "_History"
 msgstr "历史(_H)"
 
@@ -1197,8 +1197,8 @@ msgid "_Subscription"
 msgstr "认证(_S)"
 
 #: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
 msgid "_Unblock"
 msgstr ""
 
@@ -1289,7 +1289,7 @@ msgstr "该操作会从列表中移除文件传输。如果该传输处于活动
 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:820
 msgid "_Continue"
 msgstr "继续(_C)"
 
@@ -1297,7 +1297,7 @@ msgstr "继续(_C)"
 msgid "_Notify me when a file transfer is complete"
 msgstr "文件传输完成时提醒我(_N)"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
 msgid "_Open Containing Folder"
 msgstr "打开文件夹(_O)"
 
@@ -1325,7 +1325,7 @@ msgstr ""
 "联系人栏\n"
 "聊天条"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
 msgid "Bold"
 msgstr "粗体"
 
@@ -1345,11 +1345,11 @@ msgstr "Gajim 主题自定义"
 msgid "Gone"
 msgstr "已离开"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "未活动的"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
 msgid "Italic"
 msgstr "斜体"
 
@@ -1400,7 +1400,7 @@ msgstr "更换主题(_S)"
 msgid "Configure _Room..."
 msgstr "设置房间(_R)"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
 #, fuzzy
 msgid "_Bookmark"
 msgstr "将本房间加入书签(_B)"
@@ -1498,8 +1498,9 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim 历史记录管理器"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
 msgid "Delete"
 msgstr "删除"
 
@@ -1524,7 +1525,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "搜索数据库(_S)"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "对话历史"
 
@@ -1550,7 +1551,7 @@ msgstr "记录聊天历史(_L)"
 msgid "Bookmark this room"
 msgstr "将本房间加入书签(_B)"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
@@ -1578,8 +1579,8 @@ msgstr "最近："
 msgid "Room:"
 msgstr "房间："
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
 msgid "_Join"
 msgstr "加入(_J)"
 
@@ -1607,7 +1608,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "打印状态："
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
 msgid "Server:"
 msgstr "服务器："
 
@@ -1731,17 +1732,26 @@ msgid "Show a list of formattings"
 msgstr "点这里插入表情符 (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "点这里插入表情符 (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
 #: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "发送(_S)"
 
@@ -1865,7 +1875,7 @@ msgstr ""
 "每次 Gajim 启动时自动探测\n"
 "总是使用 GNOME 默认应用\n"
 "总是使用 KDE 默认应用\n"
-"总是使用 XFCE4 默认应用\n"
+"总是使用 Xfce 默认应用\n"
 "自定义"
 
 #: ../data/glade/preferences_window.glade.h:33
@@ -1882,6 +1892,16 @@ msgid "Configure color and font of the interface"
 msgstr "配置界面颜色与字体"
 
 #: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "状态消息：(_S)"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "联系人名"
+
+#: ../data/glade/preferences_window.glade.h:38
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1890,34 +1910,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display _extra email details"
 msgstr "显示扩展电子邮件详情(_E)"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display a_vatars of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
 msgid "Display status _messages of contacts in roster"
 msgstr "显示名单中联系人的状态消息(_M)"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
 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 "
@@ -1926,7 +1946,7 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定您想在聊天窗口中"
 "显示的聊天状态。"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
 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 "
@@ -1935,80 +1955,80 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角"
 "色。"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚离开的联系人"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "在群聊窗口中隐藏按钮。"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "如果选定，Gajim 会在启动时加入聊天群组"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中联系人名下方显示联系人状态消息"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2018,21 +2038,21 @@ msgstr ""
 "当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，"
 "请谨慎使用。"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
 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 ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
 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, "
@@ -2041,91 +2061,91 @@ msgstr ""
 "如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同"
 "图标方式显示，以表示在线，离开，忙，等等...)"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 msgstr "如果不禁用，Gajim 会用相应的图片表情符替代字符表情,例如“:)”"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "消息窗口：(_W)"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Ma_nage..."
 msgstr "管理...(_N)"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
 msgid ""
 "Never\n"
 "Only when pending events\n"
 "Always"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notifications"
 msgstr "帐户修改"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "提醒我关于联系人："
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "提醒我关于联系人："
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Notify on new _GMail email"
 msgstr "新 Gmail 邮件通知"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "Personal Events"
 msgstr "个人信息"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Play _sounds"
 msgstr "播放声音(_S)"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Preferences"
 msgstr "参数"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
 msgid "Show systray:"
 msgstr "在系统托盘中显示事件(_S)"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sign _out"
 msgstr "退出登录(_O)"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2133,30 +2153,30 @@ msgstr ""
 "一些消息会包含丰富的内容(例如 格式，颜色) 。如果选定，Gajim 将显示原本的消息"
 "内容。"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "按状态分类联系人(_S)"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
 msgid "Status"
 msgstr "状态"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "默认状态图标设置:(_I)"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "Style"
 msgstr "已冻结"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
 msgid "T_heme:"
 msgstr "主题：(_H)"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2164,7 +2184,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2172,113 +2192,115 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "使用代理的图标设定(_T)"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "Use system _default"
 msgstr "使用系统默认(_D)"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 #, fuzzy
 msgid "When new event is received:"
 msgstr "当新事件发生时"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "错误消息：%s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "在昵称前：(_E)"
+
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Away after:"
 msgstr "自动离开(_A)："
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "显示聊天状态信息(_F)："
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "表情符："
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_File manager:"
 msgstr "文件管理器：(_F)"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "忽略收到的消息中的扩展内容"
 
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "抵达的消息：(_I)"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Log status changes of contacts"
 msgstr "记录联系人状态变化(_L)"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Mail client:"
 msgstr "邮件客户端(_M)："
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Not available after:"
 msgstr "自动不可用(_N)："
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Open..."
 msgstr "打开...(_O)"
 
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "将要送出的消息：(_O)"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Reset to Default Colors"
 msgstr "恢复为默认颜色设置(_R)"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "显示聊天状态信息(_F)："
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Status message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
 #, fuzzy
 msgid "in _group chats"
 msgstr "加入群聊(_G)"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
 #, fuzzy
 msgid "in _roster"
 msgstr "不在名单中"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
 msgid "minutes"
 msgstr "分钟"
 
@@ -2331,7 +2353,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "订阅："
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
 msgid "Privacy List"
 msgstr "私人列表"
 
@@ -2495,7 +2517,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>属性</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>声音</b>"
@@ -2559,8 +2581,8 @@ msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -2579,14 +2601,14 @@ msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "删除"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "确定(_O)"
 
 #: ../data/glade/roster_item_exchange_window.glade.h:5
 #, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr "删除"
 
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
@@ -2647,7 +2669,7 @@ msgstr "动作(_A)"
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -2691,12 +2713,12 @@ msgid "_Add contact"
 msgstr "添加联系人(_C)"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
 #, fuzzy
 msgid "_Information"
 msgstr "联系人信息"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
 msgid "_Search"
 msgstr "查找(_S)"
 
@@ -2716,10 +2738,6 @@ msgstr "注册到"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "确定(_O)"
-
 #: ../data/glade/single_message_window.glade.h:1
 msgid "0"
 msgstr "0"
@@ -2937,338 +2955,324 @@ msgstr "资源："
 msgid "Status:"
 msgstr "状态："
 
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "联系人信息"
 
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Activated"
 msgstr "活动"
 
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
 #, fuzzy
 msgid "Deactivated"
 msgstr "未活动的"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
 #, fuzzy
 msgid "Integer"
 msgstr "群组内"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
 msgid "Text"
 msgstr "文本"
 
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
 msgid "Preference Name"
 msgstr "优先名称"
 
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
 msgid "Value"
 msgstr "值"
 
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
 msgid "Type"
 msgstr "类型"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
 msgid "(None)"
 msgstr "(无)"
 
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
 msgid "Hidden"
 msgstr "隐藏"
 
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
 #, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr ""
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] ""
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "British"
 msgstr "Briton"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Norwegian"
 msgstr "Norvegian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 #, fuzzy
 msgid "Serbian"
 msgstr "German"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
 msgid "Chinese (Ch)"
 msgstr "中文"
 
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
 msgid "Spelling language"
 msgstr "拼写检查"
 
 #. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
 msgid "A connection is not available"
 msgstr "连接不可用"
 
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
 #, fuzzy
 msgid "Underline"
 msgstr "下划线"
 
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
 #, fuzzy
 msgid "Strike"
 msgstr "昵称"
 
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Font"
 msgstr "字号：(_F)"
 
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
 #, fuzzy
 msgid "Clear formating"
 msgstr "联系人信息"
 
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "启用加密"
 
 #. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
 msgid "Not in Roster"
 msgstr "不在名单中"
 
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "文件发送、完成和中止的清单"
 
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "群聊 %(room_name)s 的 %(nickname)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
 #, fuzzy
 msgid "and authenticated"
 msgstr "使用验证"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "使用验证"
@@ -3276,79 +3280,79 @@ msgstr "使用验证"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[本条消息已加密]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
@@ -3357,23 +3361,23 @@ msgstr "%(nick)s 的状态是 %(status)s"
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 应为文件但它应为一个目录"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 应为文件但它是一个目录"
 
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目录"
@@ -3444,10 +3448,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
 #, fuzzy
 msgid "Groupchats"
 msgstr "群聊"
@@ -3559,9 +3563,9 @@ msgid ""
 msgstr "折叠的列(账户和组)的列表(空格分隔)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
 #, fuzzy
 msgid "default"
 msgstr "默认"
@@ -4142,7 +4146,7 @@ msgstr ""
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 工作区"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4150,231 +4154,230 @@ msgstr ""
 "如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
 "置(_P)"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否为此联系人使用 OpenPGP?"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
 msgid "Language for which we want to check misspelled words"
 msgstr "想要检查拼写的语言"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
 msgid "all or space separated status"
 msgstr "全部或空格分隔的状态"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "'yes', 'no', or 'both'"
 msgstr "'是'，'否'或'两者'"
 
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "'yes', 'no' or ''"
 msgstr "'是'，'否'或''"
 
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
 msgid "Back in some minutes."
 msgstr "很快回来"
 
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "吃饭"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
 msgid "I'm eating, so leave me a message."
 msgstr "正在吃饭，请留言"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
 msgid "I'm watching a movie."
 msgstr "正在看电影"
 
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
 msgid "I'm working."
 msgstr "工作中"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "Phone"
 msgstr "电话"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
 msgid "I'm on the phone."
 msgstr "我在打电话"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
 msgid "I'm free for chat."
 msgstr "自由聊天。"
 
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
 msgid "I'm not available."
 msgstr "我现在不可用。"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "Do not disturb."
 msgstr "不分发。"
 
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
 msgid "Bye!"
 msgstr "再见！"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr "当收到的群聊消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
 msgid "Sound to play when any MUC message arrives."
 msgstr "当 MUC 信息到达时的声音"
 
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "无法加载发呆模块"
 
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
 msgid "Wrong host"
 msgstr "错误主机"
 
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 所需的注册信息未按时抵达"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
 #, fuzzy
 msgid "Registration succeeded"
 msgstr " vCard 发布成功"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard 发布失败"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "不支持扩展"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "昵称不允许： %s "
@@ -4382,77 +4385,77 @@ msgstr "昵称不允许： %s "
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
 #: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
 msgid "Unable to join group chat"
 msgstr "无法加入群聊"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "您被该群聊封禁。"
 
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "不存在这样的群聊"
 
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
 msgid "Group chat creation is restricted."
 msgstr "群聊创建受限。"
 
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "您注册的昵称已被使用"
 
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不在成员名单中。"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "授权被移除"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
 msgid "I would like to add you to my roster."
 msgstr "我申请添加您到联系人名单"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr " %s 请求认证"
 
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr " %s 请求解除认证"
 
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s 解除了认证"
 
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4591,187 +4594,184 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "无法发送空文件"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"主题：%s\n"
+"%s"
+
+#: ../src/common/connection.py:721
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
 msgid "Reconnect manually."
 msgstr "手动重连。"
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
 msgid "Invalid answer"
 msgstr "无效答案"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
 msgid "Check your connection or try again later."
 msgstr "检查连接并稍后重试。"
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "保存在： %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "连接失败"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
 msgid "Check your connection or try again later"
 msgstr "检查连接并稍后重试"
 
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "“%s”登录验证失败"
 
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "添加服务错误。 %s"
 
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "无法发送空文件"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"主题：%s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "联系人"
 
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态不获取"
 
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
 #, fuzzy
 msgid "Unregister failed"
 msgstr "vCard 发布失败"
 
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
 msgid "Observers"
 msgstr "旁观者"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
 msgid "Transports"
 msgstr "代理"
 
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
 #, fuzzy
 msgid "Not in roster"
 msgstr "不在名单中"
@@ -5018,7 +5018,7 @@ msgstr "自由聊天"
 msgid "_Available"
 msgstr "在线(_A)"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
 msgid "Available"
 msgstr "在线"
 
@@ -5136,75 +5136,75 @@ msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "发送消息"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5220,16 +5220,16 @@ msgid "%s is not a valid loglevel"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "合并日志数据库"
@@ -5239,701 +5239,720 @@ msgstr "合并日志数据库"
 msgid "XMPP account %s@%s"
 msgstr "帐户 %s 的"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
 #, fuzzy
 msgid "Aroused"
 msgstr "已暂停"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Bored"
 msgstr "粗体"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Brave"
 msgstr "有"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Cautious"
 msgstr "聊天"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Cold"
 msgstr "粗体"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
 #, fuzzy
 msgid "Confident"
 msgstr "内容(_C)"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Contemplative"
 msgstr "已完成"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Contented"
 msgstr "内容(_C)"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Creative"
 msgstr "未活动的"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
 #, fuzzy
 msgid "Dejected"
 msgstr "删除"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Disappointed"
 msgstr "禁用"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Dismayed"
 msgstr "禁用"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Distracted"
 msgstr "禁用"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
 #, fuzzy
 msgid "Grumpy"
 msgstr "群组"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
 #, fuzzy
 msgid "Hot"
 msgstr "主机(_H)："
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
 #, fuzzy
 msgid "Impressed"
 msgstr "消息"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Invincible"
 msgstr "隐身"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Lonely"
 msgstr "一"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Lost"
 msgstr "主机(_H)："
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Mean"
 msgstr "German"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Moody"
 msgstr "修改(_M)"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Offended"
 msgstr "离线"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Proud"
 msgstr "群组"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
 #, fuzzy
 msgid "Relieved"
 msgstr "十一"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Sad"
 msgstr "已冻结"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
 #, fuzzy
 msgid "Satisfied"
 msgstr "名："
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Sick"
 msgstr "昵称"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
 #, fuzzy
 msgid "Sleepy"
 msgstr "正在睡觉"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Stressed"
 msgstr "街道："
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
 #, fuzzy
 msgid "Surprised"
 msgstr "订阅"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Tired"
 msgstr "时间"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
 #, fuzzy
 msgid "Undefined"
 msgstr "下划线"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
 #, fuzzy
 msgid "Doing Chores"
 msgstr "错误主机"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Cleaning"
 msgstr "晚上"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Cooking"
 msgstr "正在编写"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
 #, fuzzy
 msgid "Gardening"
 msgstr "早晨"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "群组内所有"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Drinking"
 msgstr "工作"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
 #, fuzzy
 msgid "Dancing"
 msgstr "晚上"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
 #, fuzzy
 msgid "Hiking"
 msgstr "踢出 %s"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
 #, fuzzy
 msgid "Jogging"
 msgstr "加入(_J)"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Skiing"
 msgstr "工作"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
 #, fuzzy
 msgid "Working out"
 msgstr "工作"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
 #, fuzzy
 msgid "Shaving"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
 #, fuzzy
 msgid "Hanging out"
 msgstr "正在更换话题"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
 #, fuzzy
 msgid "Hiding"
 msgstr "踢出 %s"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Praying"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Thinking"
 msgstr "工作"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
 #, fuzzy
 msgid "Relaxing"
 msgstr "高原"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
 #, fuzzy
 msgid "Fishing"
 msgstr "踢出 %s"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Gaming"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Going out"
 msgstr "退出登录(_O)"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Partying"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Reading"
 msgstr "原因"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Rehearsing"
 msgstr "原因"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Shopping"
 msgstr "正在睡觉"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Smoking"
 msgstr "工作"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Sunbathing"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "正在看电影"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Talking"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "On the Phone"
 msgstr "我在打电话"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "Traveling"
 msgstr "传输中"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "Commuting"
 msgstr "正在编写"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
 #, fuzzy
 msgid "On a Train"
 msgstr "作为链接打开(_L)："
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "Walking"
 msgstr "工作"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Coding"
 msgstr "正在编写"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Writing"
 msgstr "工作"
 
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
 #. We cannot bind port, call error callback and fail
 #: ../src/common/socks5.py:86
 #, python-format
@@ -5954,34 +5973,11 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr "您配置主机为 ft_override_host_to_send 高级选项无效，忽略。"
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "未获得 OpenPGP 密文"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "您将在无 OpenPGP 情况下连接到 %s。"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "您需要重新连接才能继续收发消息。"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi 错误"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -5990,53 +5986,46 @@ msgstr ""
 "%s\n"
 "本地消息将无法正常工作。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "请检查 Avahi 是否已经安装。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "无法启动本地服务"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, 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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "请检查 avahi-daemon 是否运行。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "无法改变账户“%s”的状态"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr "没有连接或隐身。您的消息将不会被发送。"
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[本条消息已加密]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "联系人离线。您的消息将不被发送。"
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "联系人离线。您的消息将不被发送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "到主机的连接无法建立：发送数据超时。"
@@ -6047,26 +6036,26 @@ msgstr "到主机的连接无法建立：发送数据超时。"
 msgid "Error while adding service. %s"
 msgstr "添加服务错误。 %s"
 
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../src/config.py:396
+#: ../src/config.py:383
 #, fuzzy
 msgid "Default Message"
 msgstr "默认状态消息"
 
-#: ../src/config.py:405
+#: ../src/config.py:392
 #, fuzzy
 msgid "Enabled"
 msgstr "启用"
 
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "语言 %s 的字典不可用"
 
-#: ../src/config.py:664
+#: ../src/config.py:655
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6074,213 +6063,213 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1092
 msgid "status message text"
 msgstr "状态消息文本"
 
 #. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1487
 msgid "Relogin now?"
 msgstr "现在重新登录？"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1488
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有调整立即生效，您必须重新登录。"
 
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
 msgid "Unread events"
 msgstr "未读取的事件"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1786
 msgid "Read all pending events before removing this account."
 msgstr "移除帐号前请阅读所有未决事件。"
 
-#: ../src/config.py:1747
+#: ../src/config.py:1812
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在账户 %s 打开聊天"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1813
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗？"
 
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1761
+#: ../src/config.py:1826
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1765
+#: ../src/config.py:1830
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称，需先处理所有未决事件"
 
-#: ../src/config.py:1771
+#: ../src/config.py:1836
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1772
+#: ../src/config.py:1837
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1777
+#: ../src/config.py:1842
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1781
+#: ../src/config.py:1846
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1856
+#: ../src/config.py:1921
 #, fuzzy
 msgid "Rename Account"
 msgstr "帐户管理"
 
-#: ../src/config.py:1857
+#: ../src/config.py:1922
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/config.py:1885
+#: ../src/config.py:1950
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:2115
+#: ../src/config.py:2180
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2181
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:2150
+#: ../src/config.py:2215
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2216
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2223
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2224
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:2167
+#: ../src/config.py:2232
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:2171
+#: ../src/config.py:2236
 msgid "Your server doesn't support Vcard"
 msgstr "您的服务器不支持 Vcard"
 
-#: ../src/config.py:2172
+#: ../src/config.py:2237
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
 
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:2289
+#: ../src/config.py:2354
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
 
-#: ../src/config.py:2290
+#: ../src/config.py:2355
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
 
-#: ../src/config.py:2438
+#: ../src/config.py:2510
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2512
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2549
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2550
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2551
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2610
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2545
+#: ../src/config.py:2617
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2623
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2650
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6288,11 +6277,11 @@ msgstr ""
 "<b>想做封禁谁？</b>\n"
 "\n"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2654
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2655
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6300,11 +6289,11 @@ msgstr ""
 "<b>想要将谁加为成员？</b>\n"
 "\n"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2657
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2658
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6313,11 +6302,11 @@ msgstr ""
 "<b>想要将谁加为房主？</b>\n"
 "\n"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2660
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2661
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6325,7 +6314,7 @@ msgstr ""
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2662
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6342,89 +6331,90 @@ msgstr ""
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2763
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2796
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2797
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "Default"
 msgstr "默认"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2895
 msgid "?print_status:All"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2896
 msgid "Enter and leave only"
 msgstr "只是登录和离开"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2897
 #, fuzzy
 msgid "?print_status:None"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2889
+#: ../src/config.py:2967
 msgid "New Group Chat"
 msgstr "新群聊"
 
-#: ../src/config.py:2922
+#: ../src/config.py:3000
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:2923
+#: ../src/config.py:3001
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
 #. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "无效用户名"
 
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
 #, fuzzy
 msgid "Character not allowed"
 msgstr "昵称不允许： %s "
 
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
 #, fuzzy
 msgid "Invalid server"
 msgstr "无效用户名"
 
-#: ../src/config.py:3069
+#: ../src/config.py:3147
 #, fuzzy
 msgid "Invalid room"
 msgstr "无效输入"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3299
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6434,34 +6424,34 @@ msgstr ""
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
 
-#: ../src/config.py:3226
+#: ../src/config.py:3305
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:3264
+#: ../src/config.py:3343
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3345
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:3304
+#: ../src/config.py:3383
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "联系人已经在名单中"
 
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3429
+#: ../src/config.py:3510
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6471,7 +6461,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6479,304 +6469,300 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3550
+#: ../src/config.py:3637
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3551
+#: ../src/config.py:3638
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../src/config.py:3704
+#: ../src/config.py:3791
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:3712
+#: ../src/config.py:3799
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:3747
+#: ../src/config.py:3834
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:3748
+#: ../src/config.py:3835
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:3750
+#: ../src/config.py:3837
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:3751
+#: ../src/config.py:3838
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:3752
+#: ../src/config.py:3839
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:3753
+#: ../src/config.py:3840
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:3754
+#: ../src/config.py:3841
 msgid "Group Chat Message Highlight"
 msgstr "群聊消息突出显示"
 
-#: ../src/config.py:3755
+#: ../src/config.py:3842
 msgid "Group Chat Message Received"
 msgstr "收到的群聊消息"
 
-#: ../src/config.py:3756
+#: ../src/config.py:3843
 msgid "GMail Email Received"
 msgstr "收到 GMail 邮件"
 
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "以下文字是您上次发言至今的群聊内容"
 
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
 #, fuzzy
 msgid "_Quote"
 msgstr "退出(_Q)"
 
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "“%s”的动作(_A)"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典地址缺少 “%s” 并且它不是 WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)："
 
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
 msgid "Yesterday"
-msgstr "昨天"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i 天前"
+msgid_plural "%i days ago"
+msgstr[0] "昨天"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
 
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber 即时消息客户端"
 
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "联系人名称：<i>%s</i>"
 
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID： <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
 #, fuzzy
 msgid "Set Mood"
 msgstr "设定 MOTD"
 
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "<b>保存为预设状态消息</b>"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "请为该状态信息键入名称："
 
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "AIM 地址："
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "GG 号码："
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "ICQ 号码："
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "MSN 地址："
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Yahoo! 地址："
 
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
 msgid "The user ID must not contain a resource."
 msgstr "该用户 ID 不可包含任何源"
 
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "我申请添加您到联系人名单"
 
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
 msgid "User ID:"
 msgstr "用户 ID："
 
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本："
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
 msgid "PyGTK Version:"
 msgstr "PyGTK 版本："
 
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
 msgid "Current Developers:"
 msgstr "当前的开发者："
 
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
 msgid "Past Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
 msgid "THANKS:"
 msgstr "感谢："
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "最后但不是最重要的，我们要特别感谢所有的软件维护人员。"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>\n"
 "jeanet <qianxiaojun604@gmail.com>"
 
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6786,404 +6772,437 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已经在群聊房间 %s 。"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
 #, fuzzy
 msgid "Invalid Account"
 msgstr "无效的账户名称"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "无效用户名"
 
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
 msgid "Invalid group chat Jabber ID"
 msgstr "无效的群聊 Jabber ID"
 
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "群聊 Jabber ID 包含非法字符。"
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
 msgid "This is not a group chat"
 msgstr "这不是一个群聊"
 
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s 不是群聊的名称。"
 
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "填写您想发送聊天消息到的联系人 ID 或昵称："
 
 #. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
 msgid "Invalid JID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "无法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
 msgid "New Message"
 msgstr "新消息"
 
 #. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
 msgid "New Single Message"
 msgstr "新消息"
 
 #. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
 msgid "New Private Message"
 msgstr "新的个人消息"
 
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
 msgid "New E-mail"
 msgstr "新的电子邮件"
 
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
 msgid "Groupchat Invitation"
 msgstr "群聊邀请"
 
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
 msgid "Contact Changed Status"
 msgstr "联系人状态改变"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
 #, python-format
 msgid "Single Message using account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
 #, python-format
 msgid "Single Message in account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "来自 %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
 msgid "XML Console"
 msgstr " XML 控制台"
 
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "已冻结"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "修改(_M)"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "移除(_R)"
+
+#: ../src/dialogs.py:2987
 #, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr "我想添加您到我的联系人名单"
 
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
 msgid "Add"
 msgstr "地址"
 
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
 #, fuzzy
 msgid "Modify"
 msgstr "修改(_M)"
 
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
 #, fuzzy
 msgid "Groups"
 msgstr "群组"
 
 #. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "我申请添加您到联系人名单"
 
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added  %s contacts"
+msgstr "添加联系人(_C)"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed  %s contacts"
+msgstr "从名单移除联系人"
+
+#: ../src/dialogs.py:3229
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "私人列表 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "顺序：%s，动作：%s，类型：%s，值：%s"
 
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "顺序： %s，动作：%s"
 
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
 msgid "<b>Edit a rule</b>"
 msgstr "<b>编辑规则</b>"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
 msgid "<b>Add a rule</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
 msgid "Privacy Lists"
 msgstr "私人列表"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
 msgid "Invalid List Name"
 msgstr "无效列表名"
 
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个私人列表。"
 
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "您被该群聊封禁。"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
 msgid "Images"
 msgstr "形象"
 
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为："
 
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊通告"
 
 #. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
 msgid "Condition"
 msgstr "条件"
 
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
 msgid "when I am "
 msgstr "当我"
 
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7191,38 +7210,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7232,31 +7251,50 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
 #: ../src/disco.py:118
 msgid "Others"
 msgstr "其他"
@@ -7266,363 +7304,358 @@ msgstr "其他"
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:442
+#: ../src/disco.py:478
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:554
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帐号 %s 来发掘服务"
 
-#: ../src/disco.py:518
+#: ../src/disco.py:556
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:659
+#: ../src/disco.py:706
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:660
+#: ../src/disco.py:707
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr "此地址没有服务或无应答。请检查地址后重试。"
 
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:712
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "无效用户名"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:815
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "浏览 %s 在帐户 %s 上"
 
-#: ../src/disco.py:799
+#: ../src/disco.py:859
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
 #, fuzzy
 msgid "_Execute Command"
 msgstr "执行命令(_E)..."
 
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "已扫描 %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "群聊“%s”已在您的书签中。"
 
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过“动作”菜单管理您的名单。"
 
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
 msgid "Subscribed"
 msgstr "订阅"
 
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
 #, fuzzy
 msgid "Node"
 msgstr "无"
 
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
 msgid "New post"
 msgstr "新发表"
 
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
 msgid "_Subscribe"
 msgstr "认证(_S)"
 
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
 msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Command line"
 msgstr "命令： %s "
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "OpenPGP 加密"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "抵达的消息：(_I)"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
 #, fuzzy
 msgid "Network-manager"
 msgstr "历史管理器"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 #, fuzzy
 msgid "Session Management"
 msgstr "消息已发送"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Password encryption"
 msgstr "密码不符"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Notification"
 msgstr "帐户修改"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
 #: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "调整状态(_A)"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 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 ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "OpenPGP 加密"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "抵达的消息：(_I)"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
 #, fuzzy
 msgid "RST Generator"
 msgstr "常规"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
 #, fuzzy
 msgid "Feature"
 msgstr "服务器设定"
@@ -7639,141 +7672,141 @@ msgstr "时间"
 msgid "Progress"
 msgstr "进程"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
 #, python-format
 msgid "Filename: %s"
 msgstr "文件名： %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "大小： %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:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者： %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
 msgid "Recipient: "
 msgstr "接收者： %s"
 
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存在： %s"
 
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
 msgid "File transfer completed"
 msgstr "文件传输已完成"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "文件传输已取消"
 
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
 msgid "Connection with peer cannot be established."
 msgstr "无法与对方建立连接。"
 
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者： %s"
 
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
 #, python-format
 msgid "Error message: %s"
 msgstr "错误消息：%s"
 
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "文件传输已停止"
 
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
 msgid "Choose File to Send..."
 msgstr "选择要发送的文件..."
 
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "描述： %s"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
 msgid "Gajim cannot access this file"
 msgstr "Gajim 无法访问此文件"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
 msgid "This file is being used by another process."
 msgstr "此文件正在被其它程序使用。"
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "File: %s"
 msgstr "文件： %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
 #, python-format
 msgid "Type: %s"
 msgstr "类型：%s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "Description: %s"
 msgstr "描述： %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "无法覆盖现有文件\"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
 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:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
 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:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
 msgid "You do not have permission to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
 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:449
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7781,32 +7814,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. 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:542
 #, 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:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "无效文件"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
 msgid "File: "
 msgstr "文件："
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
 msgid "Name: "
 msgstr "名称："
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
 msgid "Sender: "
 msgstr "发送者："
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
 msgid "Pause"
 msgstr "暂停"
 
@@ -7872,11 +7905,11 @@ msgid ""
 msgstr "请确认 Pywin32 已经安装在您的系统中。您可以从 %s取得它"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim 已经在运行"
 
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7884,522 +7917,122 @@ msgstr ""
 "Gajim 另一个实例似乎正在运行 \n"
 "运行？"
 
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "要求密文"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "为账户 %s 输入 GPG 密文字段"
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "您将在无 OpenPGP 情况下连接到 %s。"
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "错误字段"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "请重新输入您的 GPG 字段或点“取消”"
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"您申请的昵称正在使用或被其他人占有。\n"
-"从下列昵称中另外指定一个："
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "是否接受这个请求？"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "是否接受这个请求？"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) 授权给 %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "连接失败"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s： %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "发送 %s ( %s ) 时出现错误"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "认证请求"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "授权被接受"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "联系人“%s”已授权您查看他/她的状态。"
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "联系人“%s”移除了来自您的认证"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "退订(_S)"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "无法与对方“ %s ”建立连接。"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s 现在成了 %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s 的状态是 %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "该群聊要求密码才能加入。"
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "已建立没有 OpenPGP 密钥的连接"
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "您的密文不正确"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "您的密文不正确"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "不再提问此问题(_N)"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr " %(gmail_mail_address)s 上的新邮件"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "您有 %d 条新邮件会话"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s 想发送给您一个文件。"
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "从名单移除联系人"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "读文件错误："
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "对于每条消息(_M)"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "用户名冲突"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "<b>请在您本地账户填写新的用户名</b>"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "用户名冲突"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, 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 ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"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 ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "连接"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "您在创建一个元联系人。确定继续？"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "禁用加密"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "隐身时无法加入群聊"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "无法保存您的设置。"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "为特定命令显示帮助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "为命令显示帮助"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "为下一条未读消息弹出窗口"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "打印名单中所有联系人。每个联系人一行。"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
 msgid "account"
 msgstr "账户"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "改变一个或多个账户状态"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "状态"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
 msgid "message"
 msgstr "消息"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "状态消息"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 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 "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
 
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
 #, fuzzy
 msgid "Changes the priority of account or accounts"
 msgstr "改变一个或多个账户状态"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority"
 msgstr "优先级(_T):"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "我想注册一个新帐户(_R)"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "显示对话框用于给联系人发送消息"
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，将从此帐户列表下移出联系人"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
 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 "
@@ -8408,29 +8041,29 @@ msgstr ""
 "发送新聊天消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP 钥匙"
 
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，该消息将使用本公共密钥加密"
 
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，消息将被用此账户发送"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
 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 "
@@ -8439,215 +8072,215 @@ msgstr ""
 "发送新单条消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "主题"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "消息主题"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "获得帐号的详细信息"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "帐号名称"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "文件"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "文件路径"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，文件将被用此账户发送"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "将“密钥”的值设为“值”"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "键=值"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "“密钥”是参数名，而“值”是赋予参数的数值"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "键"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "从名单移除联系人"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "向名单添加联系人"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "为此账户加入新联系人"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "未读消息的回复总数"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "打开 '开始聊天' 对话框"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "开始聊天，使用这个账户"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "发送自定义 XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "发送 XML"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "XML 将被发送的账户；如果不指定，XML 将被发送至所有账户"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Message content"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "加入新房间(_J)"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "room"
 msgstr "来自"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Room JID"
 msgstr "房间："
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "nick"
 msgstr "昵称"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Nickname to use"
 msgstr "昵称未找到： %s "
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "password"
 msgstr "密码："
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "密码不符"
 
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "请检查 avahi-daemon 是否运行。"
 
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的“联系人 JID”参数"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8656,31 +8289,31 @@ msgstr ""
 "\"%s\" 不在您的名单中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
 msgid "Arguments:"
 msgstr "参数："
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8689,7 +8322,7 @@ msgstr ""
 "用法：%s 命令 [参数] \n"
 "命令是下列之一：\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8698,7 +8331,7 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8707,7 +8340,7 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
 #, fuzzy
 msgid "Wrong uri"
 msgstr "错误主机"
@@ -8738,174 +8371,198 @@ msgstr "无法删除当前主题"
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在群聊“%s”中或“%s”已离开。"
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
 #, fuzzy
 msgid "Conversation with "
 msgstr "对话历史"
 
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
 #, fuzzy
 msgid "Continued conversation"
 msgstr "连接"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
 #, fuzzy
 msgid "A new room has been created"
 msgstr "注册新账户成功"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
 #, 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:1219
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s 现在成了 %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
 #, fuzzy
 msgid "affiliation changed"
 msgstr "会籍："
 
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入群聊"
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s 的状态是 %(status)s"
+
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "确定要离开群聊“ %s ”？"
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口，您将断开此群聊的连接。"
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "不再提问此问题(_N)"
+
+#: ../src/groupchat_control.py:1745
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "描述： %s"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
@@ -8929,59 +8586,445 @@ msgid "Details"
 msgstr "细节"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
 msgid "Error reading file:"
 msgstr "读文件错误："
 
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
 msgid "Error parsing file:"
 msgstr "分析文件错误："
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "不能写入到 %s 。会话管理支持功能未启用"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "确认覆盖该文件？"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
 msgid "Extension not supported"
 msgstr "不支持扩展"
 
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "图片不能被保存为 %(type)s 格式。保存为 %(new_filename)s？"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
 msgid "Save Image as..."
 msgstr "图片另存为..."
 
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"您申请的昵称正在使用或被其他人占有。\n"
+"从下列昵称中另外指定一个："
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "是否接受这个请求？"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "是否接受这个请求？"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) 授权给 %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "连接失败"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s： %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "发送 %s ( %s ) 时出现错误"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "认证请求"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "授权被接受"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "联系人“%s”已授权您查看他/她的状态。"
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "联系人“%s”移除了来自您的认证"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "退订(_S)"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "无法与对方“ %s ”建立连接。"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "该群聊要求密码才能加入。"
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "已建立没有 OpenPGP 密钥的连接"
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "您的密文不正确"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "您的密文不正确"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr " %(gmail_mail_address)s 上的新邮件"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "您有 %d 条新邮件会话"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s 想发送给您一个文件。"
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "从名单移除联系人"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "读文件错误："
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "对于每条消息(_M)"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "用户名冲突"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "<b>请在您本地账户填写新的用户名</b>"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1721
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "用户名冲突"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s 想发送给您一个文件。"
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "文件传输请求"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, 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 ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"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 ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "连接"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "您在创建一个元联系人。确定继续？"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "禁用加密"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+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/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "无法保存您的设置。"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "要求密文"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "为账户 %s 输入 GPG 密文字段"
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "您将在无 OpenPGP 情况下连接到 %s。"
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "错误字段"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "请重新输入您的 GPG 字段或点“取消”"
+
+#: ../src/gui_menu_builder.py:93
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "新群聊"
 
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
 msgid "I would like to add you to my roster"
 msgstr "我想加您为好友"
 
@@ -8996,7 +9039,7 @@ msgstr "联系人"
 
 #. holds time
 #: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
 msgid "Date"
 msgstr "日期"
 
@@ -9007,7 +9050,7 @@ msgstr "昵称"
 
 #. holds message
 #: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
 msgid "Message"
 msgstr "消息"
 
@@ -9030,387 +9073,392 @@ msgstr ""
 "\n"
 "如果您点击“是”，请等待..."
 
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
 msgid "Exporting History Logs..."
 msgstr "输出历史记录..."
 
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说： %(message)s\n"
 
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
 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] "您确定要删除所选定联系人的历史记录？"
 
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您确定要删除所选定的消息？"
 
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
 
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "错误消息：%s"
 
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态：%(status)s：%(status_msg)s"
 
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态： %(status)s "
 
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "无法读取图片"
 
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "尚未连接到服务器"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "您确定要删除所选定的消息？"
 
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
 msgid "Group Chats"
 msgstr "群聊"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
 msgid "Private Chats"
 msgstr "私聊"
 
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
 msgid "Messages"
 msgstr "消息"
 
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:242
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 状态改变"
 
-#: ../src/notify.py:252
+#: ../src/notify.py:258
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上线了"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:266
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 离开了"
 
-#: ../src/notify.py:272
+#: ../src/notify.py:278
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 发来的新消息"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "来自群聊 %s 的私人消息"
 
-#: ../src/notify.py:282
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s： %(message)s"
 
-#: ../src/notify.py:285
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: ../src/notify.py:291
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: ../src/notify.py:555
+#: ../src/notify.py:568
 #, fuzzy
 msgid "Ignore"
 msgstr "九"
 
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
 msgid "Retrieving profile..."
 msgstr "取回概况..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
 #, fuzzy
 msgid "File is empty"
 msgstr "文件路径"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
 #, fuzzy
 msgid "File does not exist"
 msgstr "不存在这样的群聊"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
 msgid "Information received"
 msgstr "收到信息"
 
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "无法脱机发布个人信息。"
 
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
 msgid "Sending profile..."
 msgstr "发送概况..."
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
 msgid "Information NOT published"
 msgstr "信息没有发布"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "您将在无 OpenPGP 情况下连接到 %s。"
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr "隐身将从所有群聊中断开。确定隐身？"
 
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "确定要离开房间“ %s ”？"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "启用历史后才能再次重读消息"
 
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
 msgid "You must read them before removing this transport."
 msgstr "移除代理前请阅读所有未决事件。"
 
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "您将无法从这些代理的联系人收发消息：%s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想从名单中删除组 %s ?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同时从名单移除这个群组的所有联系人"
 
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr "移除此联系人的同时将移除认证，导致他/她将一直看到您为离线。"
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "想做什么？"
 
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr "移除此联系人的同时将默认移除认证，导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
 msgid "Contacts will be removed from your roster"
 msgstr "联系人将从您的名单中移除"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9419,32 +9467,32 @@ msgstr ""
 "移除这些联系人：%s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持元联系人存储"
 
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9452,12 +9500,12 @@ msgid ""
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时将不被保存。"
 
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9467,23 +9515,23 @@ msgstr ""
 "元联系人是一种分组若干联系人的方法。一般而言这用在当一个人有若干 Jabber 账户"
 "或代理账户时。"
 
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "无效文件"
 
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s 想发送给您一个文件："
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "发送 %s"
 
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "创建 %s 和 %s 元联系人"
@@ -9493,164 +9541,164 @@ msgstr "创建 %s 和 %s 元联系人"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
 #. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
 #. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
 #, python-format
 msgid "using %s account"
 msgstr "使用账户 %s"
 
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
 msgid "_Manage Bookmarks..."
 msgstr "书签管理(_M)..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "of account %s"
 msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "for account %s"
 msgstr "为帐户 %s"
 
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
 #, fuzzy
 msgid "Publish Tune"
 msgstr "发布(_P)"
 
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
 #, fuzzy
 msgid "Configure Services..."
 msgstr "发掘服务(_D)..."
 
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
 msgid "To all online users"
 msgstr "向所有在线用户"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "重命名联系人"
 
 #. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
 msgid "Edit _Groups"
 msgstr "编辑群组"
 
 #. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
 #, fuzzy
 msgid "Send Single Message"
 msgstr "发送单条消息(_S)"
 
 #. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
 msgid "Execute Command..."
 msgstr "运行命令..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "代理"
 
 #. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "显示代理(_P)"
 
 #. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
 #, fuzzy
 msgid "_Reconnect"
 msgstr "联系人已断开连接"
 
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
 #, fuzzy
 msgid "_Disconnect"
 msgstr "联系人已断开连接"
 
 #. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
 msgid "History Manager"
 msgstr "历史管理器"
 
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
 msgid "_Join New Group Chat"
 msgstr "加入新群聊(_J)"
 
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:128
+#: ../src/session.py:132
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:249
+#: ../src/session.py:254
 #, python-format
 msgid "Subject: %s"
 msgstr "主题：%s"
 
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:424
+#: ../src/session.py:431
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9660,7 +9708,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:458
+#: ../src/session.py:465
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9670,119 +9718,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
 msgid "Jabber ID: "
 msgstr "Jabber ID："
 
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
 msgid "Resource: "
 msgstr "资源："
 
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此群聊的 %(owner_or_admin_or_member)s"
 
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
 msgid "Status: "
 msgstr "状态"
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
 #, python-format
 msgid "Last status: %s"
 msgstr "最后状态：%s"
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
 #, python-format
 msgid " since %s"
 msgstr "自从 %s"
 
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
 #, fuzzy
 msgid "Connected"
 msgstr "连接"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
 #, fuzzy
 msgid "Disconnected"
 msgstr "联系人已断开连接"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
 msgid "Subscription: "
 msgstr "认证："
 
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
 #, fuzzy
 msgid "Tune:"
 msgstr "类型："
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
 msgid "Download"
 msgstr "下载"
 
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
 msgid "Type: "
 msgstr "类型"
 
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
 msgid "Transferred: "
 msgstr "已传输："
 
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
 msgid "Not started"
 msgstr "未开始"
 
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暂停"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
 msgid "Stalled"
 msgstr "已冻结"
 
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
 msgid "Transferring"
 msgstr "传输中"
 
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
 msgid "This service has not yet responded with detailed information"
 msgstr "服务无详细信息应答"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9790,64 +9838,98 @@ msgstr ""
 "此服务无法返回详细信息。\n"
 "它可能是继承或损坏的"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
 msgid "?Client:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>应用</b>"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
+#~ msgid "_Incoming message:"
+#~ msgstr "抵达的消息：(_I)"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "将要送出的消息：(_O)"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk+"
+
+#, fuzzy
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr "您配置主机为 ft_override_host_to_send 高级选项无效，忽略。"
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "未获得 OpenPGP 密文"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr "您需要重新连接才能继续收发消息。"
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr "没有连接或隐身。您的消息将不会被发送。"
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[本条消息已加密]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i 天前"
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "添加特殊提示(_N)"
 
@@ -10106,9 +10188,6 @@ msgstr "带有优先级的资源"
 #~ "例如：当您允许离开的状态消息，当您改变状态至离开时 Gajim 将不再询问您状态"
 #~ "消息；将会使用默认设置的消息"
 
-#~ msgid "B_efore nickname:"
-#~ msgstr "在昵称前：(_E)"
-
 #~ msgid "Chat"
 #~ msgstr "聊天"
 
diff --git a/scripts/gajim.in b/scripts/gajim.in
index 711ddac1d..e163a9bda 100644
--- a/scripts/gajim.in
+++ b/scripts/gajim.in
@@ -29,9 +29,5 @@ fi
 
 [ "$APP" = "gajim-history-manager" ] && APP="history_manager"
 
-export datadir=@DATADIR@/gajim
-PYTHON_EXEC=@PYTHON@
-
-cd ${datadir}/src
-export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
-exec ${PYTHON_EXEC} -OO $APP.py "$@"
+cd "@GAJIM_SRCDIR@"
+exec "@PYTHON@" -OO $APP.py "$@"
diff --git a/src/Makefile.am b/src/Makefile.am
index 24e7e2234..29333e3f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,67 +1,16 @@
-CLEANFILES = \
-	trayicon.c
 INCLUDES = \
 	$(PYTHON_INCLUDES)
 export MACOSX_DEPLOYMENT_TARGET=10.4
 
-if BUILD_TRAYICON
-trayiconlib_LTLIBRARIES = trayicon.la
-trayiconlibdir = $(pkglibdir)
-trayicon_la_LIBADD = $(PYGTK_LIBS)
-trayicon_la_SOURCES = \
-					  eggtrayicon.c \
-					  trayiconmodule.c
-
-nodist_trayicon_la_SOURCES = \
-					trayicon.c
-
-trayicon_la_LDFLAGS = \
-	-module -avoid-version
-trayicon_la_CFLAGS = $(PYGTK_CFLAGS)
-
-trayicon.c:
-	    pygtk-codegen-2.0 --prefix trayicon \
-		    --register $(PYGTK_DEFS)/gdk-types.defs \
-		    --register $(PYGTK_DEFS)/gtk-types.defs \
-		    --override $(srcdir)/trayicon.override \
-		    $(srcdir)/trayicon.defs > $@
-endif
-gajimsrcdir = $(pkgdatadir)/src
-gajimsrc_PYTHON = $(srcdir)/*.py
-
-gajimsrc1dir = $(pkgdatadir)/src/common
-gajimsrc1_PYTHON = \
-				$(srcdir)/common/*.py
-
-gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
-gajimsrc2_PYTHON = \
-				$(srcdir)/common/xmpp/*.py
-
-gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
-gajimsrc3_PYTHON = \
-				$(srcdir)/common/zeroconf/*.py
-
-gajimsrc4dir = $(pkgdatadir)/src/command_system
-gajimsrc4_PYTHON = \
-				   $(srcdir)/command_system/*.py
-
-gajimsrc5dir = $(pkgdatadir)/src/command_system/implementation
-gajimsrc5_PYTHON = \
-				   $(srcdir)/command_system/implementation/*.py
-
-DISTCLEANFILES =
-
-EXTRA_DIST = $(gajimsrc_PYTHON) \
-			$(gajimsrc1_PYTHON) \
-			$(gajimsrc2_PYTHON) \
-			$(gajimsrc3_PYTHON) \
-			$(gajimsrc4_PYTHON) \
-			$(gajimsrc5_PYTHON) \
-			eggtrayicon.c \
-			trayiconmodule.c \
-			eggtrayicon.h \
-			trayicon.defs \
-			trayicon.override
+gajimsrcdir = $(gajim_srcdir)
+nobase_dist_gajimsrc_PYTHON = \
+	$(srcdir)/*.py \
+	$(srcdir)/common/*.py \
+	$(srcdir)/common/protocol/*.py \
+	$(srcdir)/common/xmpp/*.py \
+	$(srcdir)/common/zeroconf/*.py \
+	$(srcdir)/command_system/*.py \
+	$(srcdir)/command_system/implementation/*.py
 
 dist-hook:
 			rm -f $(distdir)/ipython_view.py
diff --git a/src/adhoc_commands.py b/src/adhoc_commands.py
index 9b96f0fee..01d34eee6 100644
--- a/src/adhoc_commands.py
+++ b/src/adhoc_commands.py
@@ -35,17 +35,22 @@ import dialogs
 import dataforms_widget
 
 class CommandWindow:
-	'''Class for a window for single ad-hoc commands session. Note, that
-	there might be more than one for one account/jid pair in one moment.
+	"""
+	Class for a window for single ad-hoc commands session
 
-	TODO: maybe put this window into MessageWindow? consider this when
-	TODO: it will be possible to manage more than one window of one
-	TODO: account/jid pair in MessageWindowMgr.
+	Note, that there might be more than one for one account/jid pair in one
+	moment.
 
-	TODO: gtk 2.10 has a special wizard-widget, consider using it...'''
+	TODO: Maybe put this window into MessageWindow? consider this when it will
+	be possible to manage more than one window of one.
+	TODO: Account/jid pair in MessageWindowMgr.
+	TODO: GTK 2.10 has a special wizard-widget, consider using it...
+	"""
 
 	def __init__(self, account, jid, commandnode=None):
-		'''Create new window.'''
+		"""
+		Create new window
+		"""
 
 		# an account object
 		self.account = gajim.connections[account]
@@ -89,16 +94,29 @@ class CommandWindow:
 		self.xml.signal_autoconnect(self)
 		self.window.show_all()
 
-# these functions are set up by appropriate stageX methods
-	def stage_finish(self, *anything): pass
-	def stage_back_button_clicked(self, *anything): assert False
-	def stage_forward_button_clicked(self, *anything): assert False
-	def stage_execute_button_clicked(self, *anything): assert False
-	def stage_close_button_clicked(self, *anything): assert False
-	def stage_adhoc_commands_window_delete_event(self, *anything): assert False
-	def do_nothing(self, *anything): return False
+	# These functions are set up by appropriate stageX methods.
+	def stage_finish(self, *anything):
+		pass
+
+	def stage_back_button_clicked(self, *anything):
+		assert False
+
+	def stage_forward_button_clicked(self, *anything):
+		assert False
+
+	def stage_execute_button_clicked(self, *anything):
+		assert False
 
-# widget callbacks
+	def stage_close_button_clicked(self, *anything):
+		assert False
+
+	def stage_adhoc_commands_window_delete_event(self, *anything):
+		assert False
+
+	def do_nothing(self, *anything):
+		return False
+
+	# Widget callbacks...
 	def on_back_button_clicked(self, *anything):
 		return self.stage_back_button_clicked(*anything)
 
@@ -123,8 +141,10 @@ class CommandWindow:
 
 # stage 1: waiting for command list
 	def stage1(self):
-		'''Prepare the first stage. Request command list,
-		set appropriate state of widgets.'''
+		"""
+		Prepare the first stage. Request command list, set appropriate state of
+		widgets
+		"""
 		# close old stage...
 		self.stage_finish()
 
@@ -164,9 +184,12 @@ class CommandWindow:
 
 # stage 2: choosing the command to execute
 	def stage2(self):
-		'''Populate the command list vbox with radiobuttons
-		(FIXME: if there is more commands, maybe some kind of list?),
-		set widgets' state.'''
+		"""
+		Populate the command list vbox with radiobuttons
+
+		FIXME: If there is more commands, maybe some kind of list, set widgets
+		state
+		"""
 		# close old stage
 		self.stage_finish()
 
@@ -198,7 +221,9 @@ class CommandWindow:
 		self.stage_adhoc_commands_window_delete_event = self.do_nothing
 
 	def stage2_finish(self):
-		'''Remove widgets we created. Not needed when the window is destroyed.'''
+		"""
+		Remove widgets we created. Not needed when the window is destroyed
+		"""
 		def remove_widget(widget):
 			self.command_list_vbox.remove(widget)
 		self.command_list_vbox.foreach(remove_widget)
@@ -247,8 +272,10 @@ class CommandWindow:
 		pass
 
 	def stage3_close_button_clicked(self, widget):
-		''' We are in the middle of executing command. Ask user if he really want to cancel
-		the process, then... cancel it. '''
+		"""
+		We are in the middle of executing command. Ask user if he really want to
+		cancel the process, then cancel it
+		"""
 		# this works also as a handler for window_delete_event, so we have to return appropriate
 		# values
 		if self.form_status == 'completed':
@@ -362,7 +389,9 @@ class CommandWindow:
 
 # stage 4: no commands are exposed
 	def stage4(self):
-		'''Display the message. Wait for user to close the window'''
+		"""
+		Display the message. Wait for user to close the window
+		"""
 		# close old stage
 		self.stage_finish()
 
@@ -387,7 +416,9 @@ class CommandWindow:
 
 # stage 5: an error has occured
 	def stage5(self, error=None, errorid=None, senderror=False):
-		'''Display the error message. Wait for user to close the window'''
+		"""
+		Display the error message. Wait for user to close the window
+		"""
 		# FIXME: sending error to responder
 		# close old stage
 		self.stage_finish()
@@ -430,8 +461,10 @@ class CommandWindow:
 
 # helpers to handle pulsing in progressbar
 	def setup_pulsing(self, progressbar):
-		'''Set the progressbar to pulse. Makes a custom
-		function to repeatedly call progressbar.pulse() method.'''
+		"""
+		Set the progressbar to pulse. Makes a custom function to repeatedly call
+		progressbar.pulse() method
+		"""
 		assert not self.pulse_id
 		assert isinstance(progressbar, gtk.ProgressBar)
 
@@ -443,14 +476,18 @@ class CommandWindow:
 		self.pulse_id = gobject.timeout_add(80, callback)
 
 	def remove_pulsing(self):
-		'''Stop pulsing, useful when especially when removing widget.'''
+		"""
+		Stop pulsing, useful when especially when removing widget
+		"""
 		if self.pulse_id:
 			gobject.source_remove(self.pulse_id)
 		self.pulse_id=None
 
 # handling xml stanzas
 	def request_command_list(self):
-		'''Request the command list. Change stage on delivery.'''
+		"""
+		Request the command list. Change stage on delivery
+		"""
 		query = xmpp.Iq(typ='get', to=xmpp.JID(self.jid), queryNS=xmpp.NS_DISCO_ITEMS)
 		query.setQuerynode(xmpp.NS_COMMANDS)
 
@@ -481,7 +518,9 @@ class CommandWindow:
 		self.account.connection.SendAndCallForResponse(query, callback)
 
 	def send_command(self, action='execute'):
-		'''Send the command with data form. Wait for reply.'''
+		"""
+		Send the command with data form. Wait for reply
+		"""
 		# create the stanza
 		assert isinstance(self.commandnode, unicode)
 		assert action in ('execute', 'prev', 'next', 'complete')
@@ -510,7 +549,9 @@ class CommandWindow:
 		self.account.connection.SendAndCallForResponse(stanza, callback)
 
 	def send_cancel(self):
-		'''Send the command with action='cancel'. '''
+		"""
+		Send the command with action='cancel'
+		"""
 		assert self.commandnode
 		if self.sessionid and self.account.connection:
 			# we already have sessionid, so the service sent at least one reply.
diff --git a/src/advanced_configuration_window.py b/src/advanced_configuration_window.py
index c56ee27ad..b35461287 100644
--- a/src/advanced_configuration_window.py
+++ b/src/advanced_configuration_window.py
@@ -43,7 +43,9 @@ C_TYPE
 GTKGUI_GLADE = 'manage_accounts_window.glade'
 
 def rate_limit(rate):
-	''' call func at most *rate* times per second '''
+	"""
+	Call func at most *rate* times per second
+	"""
 	def decorator(func):
 		timeout = [None]
 		def f(*args, **kwargs):
@@ -131,8 +133,10 @@ class AdvancedConfigurationWindow(object):
 		gajim.interface.instances['advanced_config'] = self
 
 	def cb_value_column_data(self, col, cell, model, iter_):
-		'''check if it's boolen or holds password stuff and if yes
-		make the cellrenderertext not editable else it's editable'''
+		"""
+		Check if it's boolen or holds password stuff and if yes  make the
+		cellrenderertext not editable, else - it's editable
+		"""
 		optname = model[iter_][C_PREFNAME]
 		opttype = model[iter_][C_TYPE]
 		if opttype == self.types['boolean'] or optname == 'password':
diff --git a/src/atom_window.py b/src/atom_window.py
index 56449846f..4712dfc41 100644
--- a/src/atom_window.py
+++ b/src/atom_window.py
@@ -35,7 +35,9 @@ class AtomWindow:
 
 	@classmethod
 	def newAtomEntry(cls, entry):
-		''' Queue new entry, open window if there's no one opened. '''
+		"""
+		Queue new entry, open window if there's no one opened
+		"""
 		cls.entries.append(entry)
 
 		if cls.window is None:
@@ -48,7 +50,9 @@ class AtomWindow:
 		cls.window = None
 
 	def __init__(self):
-		''' Create new window... only if we have anything to show. '''
+		"""
+		Create new window... only if we have anything to show
+		"""
 		assert len(self.__class__.entries)>0
 
 		self.entry = None	# the entry actually displayed
@@ -69,7 +73,9 @@ class AtomWindow:
 		self.feed_title_eventbox.add_events(gtk.gdk.BUTTON_PRESS_MASK)
 
 	def displayNextEntry(self):
-		''' Get next entry from the queue and display it in the window. '''
+		"""
+		Get next entry from the queue and display it in the window
+		"""
 		assert len(self.__class__.entries)>0
 
 		newentry = self.__class__.entries.pop(0)
@@ -103,8 +109,10 @@ class AtomWindow:
 		self.entry = newentry
 
 	def updateCounter(self):
-		''' We display number of events on the top of window, sometimes it needs to be
-		changed...'''
+		"""
+		Display number of events on the top of window, sometimes it needs to be
+		changed
+		"""
 		count = len(self.__class__.entries)
 		if count>0:
 			self.new_entry_label.set_text(i18n.ngettext(
diff --git a/src/chat_control.py b/src/chat_control.py
index ca4224f81..9ef7fc2b8 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -90,16 +90,22 @@ if gajim.config.get('use_speller') and HAS_GTK_SPELL:
 
 ################################################################################
 class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
-	'''A base class containing a banner, ConversationTextview, MessageTextView
-	'''
+	"""
+	A base class containing a banner, ConversationTextview, MessageTextView
+	"""
 
 	def make_href(self, match):
 		url_color = gajim.config.get('urlmsgcolor')
-		return '<a href="%s"><span color="%s">%s</span></a>' % (match.group(),
+		url = match.group()
+		if not '://' in url:
+			url = 'http://' + url
+		return '<a href="%s"><span color="%s">%s</span></a>' % (url,
 			url_color, match.group())
 
 	def get_font_attrs(self):
-		''' get pango font attributes for banner from theme settings '''
+		"""
+		Get pango font attributes for banner from theme settings
+		"""
 		theme = gajim.config.get('roster_theme')
 		bannerfont = gajim.config.get_per('themes', theme, 'bannerfont')
 		bannerfontattrs = gajim.config.get_per('themes', theme, 'bannerfontattrs')
@@ -133,48 +139,60 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 			type_]))
 
 	def draw_banner(self):
-		'''Draw the fat line at the top of the window that
-		houses the icon, jid, ...
-		'''
+		"""
+		Draw the fat line at the top of the window that houses the icon, jid, etc
+
+		Derived types MAY implement this.
+		"""
 		self.draw_banner_text()
 		self._update_banner_state_image()
 		gajim.plugin_manager.gui_extension_point('chat_control_base_draw_banner',
 												 self)
-		# Derived types MAY implement this
 
 	def draw_banner_text(self):
-		pass # Derived types SHOULD implement this
+		"""
+		Derived types SHOULD implement this
+		"""
+		pass
 
 	def update_ui(self):
+		"""
+		Derived types SHOULD implement this
+		"""
 		self.draw_banner()
-		# Derived types SHOULD implement this
 
 	def repaint_themed_widgets(self):
+		"""
+		Derived types MAY implement this
+		"""
 		self._paint_banner()
 		self.draw_banner()
-		# Derived classes MAY implement this
 
 	def _update_banner_state_image(self):
-		pass # Derived types MAY implement this
+		"""
+		Derived types MAY implement this
+		"""
+		pass
 
 	def handle_message_textview_mykey_press(self, widget, event_keyval,
-	event_keymod):
-		# Derived should implement this rather than connecting to the event
-		# itself.
-
+			event_keymod):
+		"""
+		Derives types SHOULD implement this, rather than connection to the even
+		itself
+		"""
 		event = gtk.gdk.Event(gtk.gdk.KEY_PRESS)
 		event.keyval = event_keyval
 		event.state = event_keymod
 		event.time = 0
 
-		buffer = widget.get_buffer()
-		start, end = buffer.get_bounds()
+		_buffer = widget.get_buffer()
+		start, end = _buffer.get_bounds()
 
 		if event.keyval -- gtk.keysyms.Tab:
-			position = buffer.get_insert()
-			end = buffer.get_iter_at_mark(position)
+			position = _buffer.get_insert()
+			end = _buffer.get_iter_at_mark(position)
 
-			text = buffer.get_text(start, end, False)
+			text = _buffer.get_text(start, end, False)
 			text = text.decode('utf8')
 
 			splitted = text.split()
@@ -202,8 +220,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 									self.command_hits.append(name)
 
 				if self.command_hits:
-					buffer.delete(start, end)
-					buffer.insert_at_cursor(self.COMMAND_PREFIX + self.command_hits[0] + ' ')
+					_buffer.delete(start, end)
+					_buffer.insert_at_cursor(self.COMMAND_PREFIX + self.command_hits[0] + ' ')
 					self.last_key_tabs = True
 
 				return True
@@ -214,7 +232,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		helpers.launch_browser_mailer('url', url)
 
 	def __init__(self, type_id, parent_win, widget_name, contact, acct,
-	resource = None):
+			resource = None):
 		if resource is None:
 			# We very likely got a contact with a random resource.
 			# This is bad, we need the highest for caps etc.
@@ -244,21 +262,10 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		self.urlfinder = re.compile(
 			r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]")
 
-		if gajim.HAVE_PYSEXY:
-			import sexy
-			self.banner_status_label = sexy.UrlLabel()
-			self.banner_status_label.connect('url_activated',
-				self.status_url_clicked)
-		else:
-			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.banner_status_label = self.xml.get_widget('banner_label')
+		id_ = 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)
-		self.banner_status_label.show()
+		self.handlers[id_] = self.banner_status_label
 
 		# Init DND
 		self.TARGET_TYPE_URI_LIST = 80
@@ -393,7 +400,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 				dialogs.AspellDictError(lang)
 
 	def on_banner_label_populate_popup(self, label, menu):
-		'''We override the default context menu and add our own menutiems'''
+		"""
+		Override the default context menu and add our own menutiems
+		"""
 		item = gtk.SeparatorMenuItem()
 		menu.prepend(item)
 
@@ -414,8 +423,10 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		gajim.plugin_manager.remove_gui_extension_point('chat_control_base_draw_banner', self)
 
 	def on_msg_textview_populate_popup(self, textview, menu):
-		'''we override the default context menu and we prepend an option to switch
-		languages'''
+		"""
+		Override the default context menu and we prepend an option to switch
+		languages
+		"""
 		def _on_select_dictionary(widget, lang):
 			per_type = 'contacts'
 			if self.type_id == message_control.TYPE_GC:
@@ -459,12 +470,16 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 
 	# moved from ChatControl
 	def _on_banner_eventbox_button_press_event(self, widget, event):
-		'''If right-clicked, show popup'''
+		"""
+		If right-clicked, show popup
+		"""
 		if event.button == 3: # right click
 			self.parent_win.popup_menu(event)
 
 	def _on_send_button_clicked(self, widget):
-		'''When send button is pressed: send the current message'''
+		"""
+		When send button is pressed: send the current message
+		"""
 		if gajim.connections[self.account].connected < 2: # we are not connected
 			dialogs.ErrorDialog(_('A connection is not available'),
 				_('Your message can not be sent until you are connected.'))
@@ -479,7 +494,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		self.send_message(message, xhtml=xhtml)
 
 	def _paint_banner(self):
-		'''Repaint banner with theme color'''
+		"""
+		Repaint banner with theme color
+		"""
 		theme = gajim.config.get('roster_theme')
 		bgcolor = gajim.config.get_per('themes', theme, 'bannerbgcolor')
 		textcolor = gajim.config.get_per('themes', theme, 'bannertextcolor')
@@ -526,9 +543,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		self.handlers[id_] = widget
 
 	def _on_style_set_event(self, widget, style, *opts):
-		'''set style of widget from style class *.Frame.Eventbox
+		"""
+		Set style of widget from style class *.Frame.Eventbox
 			opts[0] == True -> set fg color
-			opts[1] == True -> set bg color'''
+			opts[1] == True -> set bg color
+		"""
 		banner_eventbox = self.xml.get_widget('banner_eventbox')
 		self.disconnect_style_event(widget)
 		if opts[1]:
@@ -603,11 +622,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		return False
 
 	def _on_message_textview_mykeypress_event(self, widget, event_keyval,
-		event_keymod):
-		'''When a key is pressed:
-		if enter is pressed without the shift key, message (if not empty) is sent
-		and printed in the conversation'''
-
+			event_keymod):
+		"""
+		When a key is pressed: if enter is pressed without the shift key, message
+		(if not empty) is sent and printed in the conversation
+		"""
 		# NOTE: handles mykeypress which is custom signal connected to this
 		# CB in new_tab(). for this singal see message_textview.py
 		message_textview = widget
@@ -666,8 +685,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 				event_keymod)
 
 	def _on_drag_data_received(self, widget, context, x, y, selection,
-		target_type, timestamp):
-		pass # Derived classes SHOULD implement this method
+			target_type, timestamp):
+		"""
+		Derived types SHOULD implement this
+		"""
+		pass
 
 	def _on_drag_leave(self, widget, context, time):
 		# FIXME: DND on non editable TextView, find a better way
@@ -682,10 +704,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 			self.conv_textview.tv.set_editable(True)
 
 	def send_message(self, message, keyID='', type_='chat', chatstate=None,
-	msg_id=None, composing_xep=None, resource=None,
-	xhtml=None, callback=None, callback_args=[], process_commands=True):
-		'''Send the given message to the active tab. Doesn't return None if error
-		'''
+			msg_id=None, composing_xep=None, resource=None, xhtml=None,
+			callback=None, callback_args=[], process_commands=True):
+		"""
+		Send the given message to the active tab. Doesn't return None if error
+		"""
 		if not message or message == '\n':
 			return None
 
@@ -725,10 +748,13 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		self.orig_msg = None
 
 	def print_conversation_line(self, text, kind, name, tim,
-	other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[],
-	count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False,
-	xep0184_id=None, graphics=True):
-		'''prints 'chat' type messages'''
+			other_tags_for_name=[], other_tags_for_time=[],
+			other_tags_for_text=[], count_as_new=True, subject=None,
+			old_kind=None, xhtml=None, simple=False, xep0184_id=None,
+			graphics=True):
+		"""
+		Print 'chat' type messages
+		"""
 		jid = self.contact.jid
 		full_jid = self.get_full_jid()
 		textview = self.conv_textview
@@ -803,8 +829,10 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 				self.parent_win.show_title(False, self) # Disabled Urgent hint
 
 	def toggle_emoticons(self):
-		'''hide show emoticons_button and make sure emoticons_menu is always there
-		when needed'''
+		"""
+		Hide show emoticons_button and make sure emoticons_menu is always there
+		when needed
+		"""
 		emoticons_button = self.xml.get_widget('emoticons_button')
 		if gajim.config.get('emoticons_theme'):
 			emoticons_button.show()
@@ -822,12 +850,16 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		self.msg_textview.grab_focus()
 
 	def on_emoticons_button_clicked(self, widget):
-		'''popup emoticons menu'''
+		"""
+		Popup emoticons menu
+		"""
 		gajim.interface.emoticon_menuitem_clicked = self.append_emoticon
 		gajim.interface.popup_emoticons_under_button(widget, self.parent_win)
 
 	def on_formattings_button_clicked(self, widget):
-		'''popup formattings menu'''
+		"""
+		Popup formattings menu
+		"""
 		menu = gtk.Menu()
 
 		menuitems = ((_('Bold'), 'bold'),
@@ -889,7 +921,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 
 
 	def on_actions_button_clicked(self, widget):
-		'''popup action menu'''
+		"""
+		Popup action menu
+		"""
 		menu = self.prepare_context_menu(hide_buttonbar_items=True)
 		menu.show_all()
 		gtkgui_helpers.popup_emoticons_under_button(menu, widget,
@@ -909,7 +943,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		buffer_.delete(start, end)
 
 	def _on_history_menuitem_activate(self, widget = None, jid = None):
-		'''When history menuitem is pressed: call history window'''
+		"""
+		When history menuitem is pressed: call history window
+		"""
 		if not jid:
 			jid = self.contact.jid
 
@@ -921,7 +957,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 				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'''
+		"""
+		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)
@@ -949,7 +987,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		_on_ok(self.contact)
 
 	def on_minimize_menuitem_toggled(self, widget):
-		'''When a grouchat is minimized, unparent the tab, put it in roster etc'''
+		"""
+		When a grouchat is minimized, unparent the tab, put it in roster etc
+		"""
 		old_value = False
 		minimized_gc = gajim.config.get_per('accounts', self.account,
 			'minimized_gc').split()
@@ -979,7 +1019,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 
 
 	def bring_scroll_to_end(self, textview, diff_y = 0):
-		''' scrolls to the end of textview if end is not visible '''
+		"""
+		Scroll to the end of textview if end is not visible
+		"""
 		if self.scroll_to_end_id:
 			# a scroll is already planned
 			return
@@ -1000,10 +1042,12 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		return False
 
 	def size_request(self, msg_textview , requisition):
-		''' When message_textview changes its size. If the new height
-		will enlarge the window, enable the scrollbar automatic policy
-		Also enable scrollbar automatic policy for horizontal scrollbar
-		if message we have in message_textview is too big'''
+		"""
+		When message_textview changes its size: if the new height will enlarge
+		the window, enable the scrollbar automatic policy.  Also enable scrollbar
+		automatic policy for horizontal scrollbar if message we have in
+		message_textview is too big
+		"""
 		if msg_textview.window is None:
 			return
 
@@ -1096,8 +1140,10 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 				self.redraw_after_event_removed(jid)
 
 	def redraw_after_event_removed(self, jid):
-		''' We just removed a 'printed_*' event, redraw contact in roster or
-		gc_roster and titles in	roster and msg_win '''
+		"""
+		We just removed a 'printed_*' event, redraw contact in roster or
+		gc_roster and titles in	roster and msg_win
+		"""
 		self.parent_win.redraw_tab(self)
 		self.parent_win.show_title()
 		# TODO : get the contact and check notify.get_show_in_roster()
@@ -1156,7 +1202,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 		return color
 
 	def widget_set_visible(self, widget, state):
-		'''Show or hide a widget. state is bool'''
+		"""
+		Show or hide a widget
+		"""
 		# make the last message visible, when changing to "full view"
 		if not state:
 			gobject.idle_add(self.conv_textview.scroll_to_end_iter)
@@ -1168,7 +1216,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 			widget.show_all()
 
 	def chat_buttons_set_visible(self, state):
-		'''Toggle chat buttons. state is bool'''
+		"""
+		Toggle chat buttons
+		"""
 		MessageControl.chat_buttons_set_visible(self, state)
 		self.widget_set_visible(self.xml.get_widget('actions_hbox'), state)
 
@@ -1187,7 +1237,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 
 ################################################################################
 class ChatControl(ChatControlBase):
-	'''A control for standard 1-1 chat'''
+	"""
+	A control for standard 1-1 chat
+	"""
 	(
 		JINGLE_STATE_NOT_AVAILABLE,
 		JINGLE_STATE_AVAILABLE,
@@ -1228,25 +1280,19 @@ class ChatControl(ChatControlBase):
 		id_ = self._audio_button.connect('toggled', self.on_audio_button_toggled)
 		self.handlers[id_] = self._audio_button
 		# add a special img
-		path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-			'mic_inactive.png')
-		img = gtk.Image()
-		img.set_from_file(path_to_img)
-		self._audio_button.set_image(img)
+		gtkgui_helpers.add_image_to_button(self._audio_button,
+			'gajim-mic_inactive')
 
 		self._video_button = self.xml.get_widget('video_togglebutton')
 		id_ = self._video_button.connect('toggled', self.on_video_button_toggled)
 		self.handlers[id_] = self._video_button
 		# add a special img
-		path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-			'cam_inactive.png')
-		img = gtk.Image()
-		img.set_from_file(path_to_img)
-		self._video_button.set_image(img)
+		gtkgui_helpers.add_image_to_button(self._video_button,
+			'gajim-cam_inactive')
 
 		self._send_file_button = self.xml.get_widget('send_file_button')
 		# add a special img for send file button
-		path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png')
+		path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload')
 		img = gtk.Image()
 		img.set_from_file(path_to_upload_img)
 		self._send_file_button.set_image(img)
@@ -1293,21 +1339,20 @@ class ChatControl(ChatControlBase):
 		self.video_state = self.JINGLE_STATE_NOT_AVAILABLE
 
 		self.update_toolbar()
-
-		self._mood_image = self.xml.get_widget('mood_image')
-		self._activity_image = self.xml.get_widget('activity_image')
-		self._tune_image = self.xml.get_widget('tune_image')
-
-		self.update_mood()
-		self.update_activity()
-		self.update_tune()
+		
+		self._pep_images = {}
+		self._pep_images['mood'] = self.xml.get_widget('mood_image')
+		self._pep_images['activity'] = self.xml.get_widget('activity_image')
+		self._pep_images['tune'] = self.xml.get_widget('tune_image')
+		self._pep_images['location'] = self.xml.get_widget('location_image')
+		self.update_all_pep_types()
 
 		# keep timeout id and window obj for possible big avatar
 		# it is on enter-notify and leave-notify so no need to be
 		# per jid
 		self.show_bigger_avatar_timeout_id = None
 		self.bigger_avatar_window = None
-		self.show_avatar(self.contact.resource)
+		self.show_avatar()
 
 		# chatstate timers and state
 		self.reset_kbd_mouse_timeout_vars()
@@ -1337,6 +1382,26 @@ class ChatControl(ChatControlBase):
 			self.on_avatar_eventbox_button_press_event)
 		self.handlers[id_] = widget
 
+		widget = self.xml.get_widget('location_eventbox')
+		id_ = widget.connect('button-release-event',
+			self.on_location_eventbox_button_release_event)
+		self.handlers[id_] = widget
+
+		for key in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'):
+			widget = self.xml.get_widget(key + '_button')
+			id_ = widget.connect('pressed', self.on_num_button_pressed, key)
+			self.handlers[id_] = widget
+			id_ = widget.connect('released', self.on_num_button_released)
+			self.handlers[id_] = widget
+
+		widget = self.xml.get_widget('mic_hscale')
+		id_ = widget.connect('value_changed', self.on_mic_hscale_value_changed)
+		self.handlers[id_] = widget
+
+		widget = self.xml.get_widget('sound_hscale')
+		id_ = widget.connect('value_changed', self.on_sound_hscale_value_changed)
+		self.handlers[id_] = widget
+
 		if not session:
 			# Don't use previous session if we want to a specific resource
 			# and it's not the same
@@ -1444,118 +1509,24 @@ class ChatControl(ChatControlBase):
 			self._convert_to_gc_button.set_sensitive(True)
 		else:
 			self._convert_to_gc_button.set_sensitive(False)
+	
+	def update_all_pep_types(self):
+		for pep_type in self._pep_images:
+			self.update_pep(pep_type)
 
-	def update_mood(self):
-		mood = None
-		text = None
-
+	def update_pep(self, pep_type):
 		if isinstance(self.contact, GC_Contact):
 			return
-
-		if 'mood' in self.contact.mood:
-			mood = self.contact.mood['mood'].strip()
-		if 'text' in self.contact.mood:
-			text = self.contact.mood['text'].strip()
-
-		if mood is not None:
-			if mood in MOODS:
-				self._mood_image.set_from_pixbuf(gtkgui_helpers.load_mood_icon(
-						mood).get_pixbuf())
-				# Translate standard moods
-				mood = MOODS[mood]
-			else:
-				self._mood_image.set_from_pixbuf(gtkgui_helpers.load_mood_icon(
-					'unknown').get_pixbuf())
-
-			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)
-			self._mood_image.show()
-		else:
-			self._mood_image.hide()
-
-	def update_activity(self):
-		activity = None
-		subactivity = None
-		text = None
-
-		if isinstance(self.contact, GC_Contact):
+		if pep_type not in self._pep_images:
 			return
-
-		if 'activity' in self.contact.activity:
-			activity = self.contact.activity['activity'].strip()
-		if 'subactivity' in self.contact.activity:
-			subactivity = self.contact.activity['subactivity'].strip()
-		if 'text' in self.contact.activity:
-			text = self.contact.activity['text'].strip()
-
-		if activity is not None:
-			if activity in ACTIVITIES:
-				# Translate standard activities
-				if subactivity in ACTIVITIES[activity]:
-					self._activity_image.set_from_pixbuf(
-						gtkgui_helpers.load_activity_icon(activity, subactivity). \
-						get_pixbuf())
-					subactivity = ACTIVITIES[activity][subactivity]
-				else:
-					self._activity_image.set_from_pixbuf(
-						gtkgui_helpers.load_activity_icon(activity).get_pixbuf())
-				activity = ACTIVITIES[activity]['category']
-			else:
-				self._activity_image.set_from_pixbuf(
-					gtkgui_helpers.load_activity_icon('unknown').get_pixbuf())
-
-			# Translate standard subactivities
-
-			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()
+		pep = self.contact.pep
+		img = self._pep_images[pep_type]
+		if pep_type in pep:
+			img.set_from_pixbuf(pep[pep_type].asPixbufIcon())
+			img.set_tooltip_markup(pep[pep_type].asMarkupText())
+			img.show()
 		else:
-			self._activity_image.hide()
-
-	def update_tune(self):
-		artist = None
-		title = None
-		source = None
-
-		if isinstance(self.contact, GC_Contact):
-			return
-
-		if 'artist' in self.contact.tune:
-			artist = self.contact.tune['artist'].strip()
-			artist = gobject.markup_escape_text(artist)
-		if 'title' in self.contact.tune:
-			title = self.contact.tune['title'].strip()
-			title = gobject.markup_escape_text(title)
-		if 'source' in self.contact.tune:
-			source = self.contact.tune['source'].strip()
-			source = gobject.markup_escape_text(source)
-
-		if artist or title:
-			if not artist:
-				artist = _('Unknown Artist')
-			if not title:
-				title = _('Unknown Title')
-			if not source:
-				source = _('Unknown 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()
+			img.hide()
 
 		# PluginSystem: adding GUI extension point for this ChatControl 
 		# instance object
@@ -1565,27 +1536,44 @@ class ChatControl(ChatControlBase):
 	def _update_jingle(self, jingle_type):
 		if jingle_type not in ('audio', 'video'):
 			return
-		if self.__dict__[jingle_type + '_state'] in (
-		self.JINGLE_STATE_NOT_AVAILABLE, self.JINGLE_STATE_AVAILABLE):
-			self.__dict__['_' + jingle_type + '_banner_image'].hide()
+		banner_image = getattr(self, '_' + jingle_type + '_banner_image')
+		state = getattr(self, jingle_type + '_state')
+		if state in (self.JINGLE_STATE_NOT_AVAILABLE,
+		self.JINGLE_STATE_AVAILABLE):
+			banner_image.hide()
 		else:
-			self.__dict__['_' + jingle_type + '_banner_image'].show()
-		if self.audio_state == self.JINGLE_STATE_CONNECTING:
-			self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock(
+			banner_image.show()
+		if state == self.JINGLE_STATE_CONNECTING:
+			banner_image.set_from_stock(
 				gtk.STOCK_CONVERT, 1)
-		elif self.audio_state == self.JINGLE_STATE_CONNECTION_RECEIVED:
-			self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock(
+		elif state == self.JINGLE_STATE_CONNECTION_RECEIVED:
+			banner_image.set_from_stock(
 				gtk.STOCK_NETWORK, 1)
-		elif self.audio_state == self.JINGLE_STATE_CONNECTED:
-			self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock(
+		elif state == self.JINGLE_STATE_CONNECTED:
+			banner_image.set_from_stock(
 				gtk.STOCK_CONNECT, 1)
-		elif self.audio_state == self.JINGLE_STATE_ERROR:
-			self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock(
+		elif state == self.JINGLE_STATE_ERROR:
+			banner_image.set_from_stock(
 				gtk.STOCK_DIALOG_WARNING, 1)
 		self.update_toolbar()
 
 	def update_audio(self):
 		self._update_jingle('audio')
+		vbox = self.xml.get_widget('audio_vbox')
+		if self.audio_state == self.JINGLE_STATE_CONNECTED:
+			# Set volume from config
+			input_vol = gajim.config.get('audio_input_volume')
+			output_vol = gajim.config.get('audio_output_volume')
+			input_vol = max(min(input_vol, 100), 0)
+			output_vol = max(min(output_vol, 100), 0)
+			self.xml.get_widget('mic_hscale').set_value(input_vol)
+			self.xml.get_widget('sound_hscale').set_value(output_vol)
+			# Show vbox
+			vbox.set_no_show_all(False)
+			vbox.show_all()
+		elif not self.audio_sid:
+			vbox.set_no_show_all(True)
+			vbox.hide()
 
 	def update_video(self):
 		self._update_jingle('video')
@@ -1621,27 +1609,27 @@ class ChatControl(ChatControlBase):
 
 		if state in states:
 			jingle_state = states[state]
-			if self.__dict__[jingle_type + '_state'] == jingle_state:
+			if getattr(self, jingle_type + '_state') == jingle_state:
 				return
-			self.__dict__[jingle_type + '_state'] = jingle_state
+			setattr(self, jingle_type + '_state', jingle_state)
 
 		# Destroy existing session with the user when he signs off
 		# We need to do that before modifying the sid
 		if state == 'not_available':
 			gajim.connections[self.account].delete_jingle_session(
-				self.contact.get_full_jid(), self.__dict__[jingle_type + '_sid'])
+				self.contact.get_full_jid(), getattr(self, jingle_type + '_sid'))
 
 		if state in ('not_available', 'available', 'stop'):
-			self.__dict__[jingle_type + '_sid'] = None
+			setattr(self, jingle_type + '_sid', None)
 		if state in ('connection_received', 'connecting'):
-			self.__dict__[jingle_type + '_sid'] = sid
+			setattr(self, jingle_type + '_sid', sid)
 
 		if state in ('connecting', 'connected', 'connection_received'):
-			self.__dict__['_' + jingle_type + '_button'].set_active(True)
+			getattr(self, '_' + jingle_type + '_button').set_active(True)
 		elif state in ('not_available', 'stop'):
-			self.__dict__['_' + jingle_type + '_button'].set_active(False)
+			getattr(self, '_' + jingle_type + '_button').set_active(False)
 
-		eval('self.update_' + jingle_type)()
+		getattr(self, 'update_' + jingle_type)()
 
 	def set_audio_state(self, state, sid=None, reason=None):
 		self._set_jingle_state('audio', state, sid=sid, reason=reason)
@@ -1649,17 +1637,39 @@ class ChatControl(ChatControlBase):
 	def set_video_state(self, state, sid=None, reason=None):
 		self._set_jingle_state('video', state, sid=sid, reason=reason)
 
+	def _get_audio_content(self):
+		session = gajim.connections[self.account].get_jingle_session(
+			self.contact.get_full_jid(), self.audio_sid)
+		return session.get_content('audio')
+
+	def on_num_button_pressed(self, widget, num):
+		self._get_audio_content()._start_dtmf(num)
+
+	def on_num_button_released(self, released):
+		self._get_audio_content()._stop_dtmf()
+
+	def on_mic_hscale_value_changed(self, widget):
+		value = widget.get_value()
+		self._get_audio_content().set_mic_volume(value / 100)
+		# Save volume to config
+		# FIXME: Putting it here is maybe not the right thing to do?
+		gajim.config.set('audio_input_volume', value)
+
+
+	def on_sound_hscale_value_changed(self, widget):
+		value = widget.get_value()
+		self._get_audio_content().set_out_volume(value / 100)
+		# Save volume to config
+		# FIXME: Putting it here is maybe not the right thing to do?
+		gajim.config.set('audio_output_volume', value)
+
 	def on_avatar_eventbox_enter_notify_event(self, widget, event):
-		'''
-		we enter the eventbox area so we under conditions add a timeout
-		to show a bigger avatar after 0.5 sec
-		'''
+		"""
+		Enter the eventbox area so we under conditions add a timeout to show a
+		bigger avatar after 0.5 sec
+		"""
 		jid = self.contact.jid
-		is_fake = False
-		if self.type_id == message_control.TYPE_PM:
-			is_fake = True
-		avatar_pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid,
-			is_fake)
+		avatar_pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid)
 		if avatar_pixbuf in ('ask', None):
 			return
 		avatar_w = avatar_pixbuf.get_width()
@@ -1676,20 +1686,23 @@ class ChatControl(ChatControlBase):
 				self.show_bigger_avatar, widget)
 
 	def on_avatar_eventbox_leave_notify_event(self, widget, event):
-		'''we left the eventbox area that holds the avatar img'''
+		"""
+		Left the eventbox area that holds the avatar img
+		"""
 		# did we add a timeout? if yes remove it
 		if self.show_bigger_avatar_timeout_id is not None:
 			gobject.source_remove(self.show_bigger_avatar_timeout_id)
 
 	def on_avatar_eventbox_button_press_event(self, widget, event):
-		'''If right-clicked, show popup'''
+		"""
+		If right-clicked, show popup
+		"""
 		if event.button == 3: # right click
 			menu = gtk.Menu()
 			menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS)
 			id_ = menuitem.connect('activate',
 				gtkgui_helpers.on_avatar_save_as_menuitem_activate,
-				self.contact.jid, self.account, self.contact.get_shown_name() + \
-					'.jpeg')
+				self.contact.jid, self.account, self.contact.get_shown_name())
 			self.handlers[id_] = menuitem
 			menu.append(menuitem)
 			menu.show_all()
@@ -1698,9 +1711,20 @@ class ChatControl(ChatControlBase):
 			menu.show_all()
 			menu.popup(None, None, None, event.button, event.time)
 		return True
+		
+	def on_location_eventbox_button_release_event(self, widget, event):
+		if 'location' in self.contact.pep:
+			location = self.contact.pep['location']._pep_specific_data
+			if ('lat' in location) and ('lon' in location):
+				uri = 'http://www.openstreetmap.org/?' + \
+					'mlat=%(lat)s&mlon=%(lon)s&zoom=16' % {'lat': location['lat'],
+					'lon': location['lon']}
+				helpers.launch_browser_mailer('url', uri)
 
 	def _on_window_motion_notify(self, widget, event):
-		'''it gets called no matter if it is the active window or not'''
+		"""
+		It gets called no matter if it is the active window or not
+		"""
 		if self.parent_win.get_active_jid() == self.contact.jid:
 			# if window is the active one, change vars assisting chatstate
 			self.mouse_over_in_last_5_secs = True
@@ -1753,9 +1777,10 @@ class ChatControl(ChatControlBase):
 					banner_status_img.set_from_pixbuf(scaled_pix)
 
 	def draw_banner_text(self):
-		'''Draw the text in the fat line at the top of the window that
-		houses the name, jid.
-		'''
+		"""
+		Draw the text in the fat line at the top of the window that houses the
+		name, jid
+		"""
 		contact = self.contact
 		jid = contact.jid
 
@@ -1829,14 +1854,11 @@ class ChatControl(ChatControlBase):
 			label_tooltip = '%s%s' % (name, acct_info)
 
 		if status_escaped:
-			if gajim.HAVE_PYSEXY:
-				status_text = self.urlfinder.sub(self.make_href, status_escaped)
-				status_text = '<span %s>%s</span>' % (font_attrs_small, status_text)
-			else:
-				status_text = '<span %s>%s</span>' % (font_attrs_small, status_escaped)
+			status_text = self.urlfinder.sub(self.make_href, status_escaped)
+			status_text = '<span %s>%s</span>' % (font_attrs_small, status_escaped)
 			self.banner_status_label.set_tooltip_text(status)
-			self.banner_status_label.show()
 			self.banner_status_label.set_no_show_all(False)
+			self.banner_status_label.show()
 		else:
 			status_text = ''
 			self.banner_status_label.hide()
@@ -1847,45 +1869,39 @@ class ChatControl(ChatControlBase):
 		banner_name_label.set_markup(label_text)
 		banner_name_label.set_tooltip_text(label_tooltip)
 
-	def on_audio_button_toggled(self, widget):
+	def close_jingle_content(self, jingle_type):
+		sid = getattr(self, jingle_type + '_sid')
+		if not sid:
+			return
+		session = gajim.connections[self.account].get_jingle_session(
+			self.contact.get_full_jid(), sid)
+		if session:
+			content = session.get_content(jingle_type)
+			if content:
+				session.remove_content(content.creator, content.name)
+
+	def on_jingle_button_toggled(self, widget, jingle_type):
+		img_name = 'gajim-%s_%s' % ({'audio': 'mic', 'video': 'cam'}[jingle_type],
+				{True: 'active', False: 'inactive'}[widget.get_active()])
+		path_to_img = gtkgui_helpers.get_icon_path(img_name)
+
 		if widget.get_active():
-			path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-				'mic_active.png')
-			if self.audio_state == self.JINGLE_STATE_AVAILABLE:
-				sid = gajim.connections[self.account].startVoIP(
-					self.contact.get_full_jid())
-				self.set_audio_state('connecting', sid)
+			if getattr(self, jingle_type + '_state') == \
+			self.JINGLE_STATE_AVAILABLE:
+				sid = getattr(gajim.connections[self.account],
+					'start_' + jingle_type)(self.contact.get_full_jid())
+				getattr(self, 'set_' + jingle_type + '_state')('connecting', sid)
 		else:
-			path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-				'mic_inactive.png')
-			session = gajim.connections[self.account].get_jingle_session(
-				self.contact.get_full_jid(), self.audio_sid)
-			if session:
-				content = session.get_content('audio')
-				if content:
-					session.remove_content(content.creator, content.name)
-		img = self._audio_button.get_property('image')
+			self.close_jingle_content(jingle_type)
+
+		img = getattr(self, '_' + jingle_type + '_button').get_property('image')
 		img.set_from_file(path_to_img)
 
+	def on_audio_button_toggled(self, widget):
+		self.on_jingle_button_toggled(widget, 'audio')
+
 	def on_video_button_toggled(self, widget):
-		if widget.get_active():
-			path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-				'cam_active.png')
-			if self.video_state == self.JINGLE_STATE_AVAILABLE:
-				sid = gajim.connections[self.account].startVideoIP(
-					self.contact.get_full_jid())
-				self.set_video_state('connecting', sid)
-		else:
-			path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-				'cam_inactive.png')
-			session = gajim.connections[self.account].get_jingle_session(
-				self.contact.get_full_jid(), self.video_sid)
-			if session:
-				content = session.get_content('video')
-				if content:
-					session.remove_content(content.creator, content.name)
-		img = self._video_button.get_property('image')
-		img.set_from_file(path_to_img)
+		self.on_jingle_button_toggled(widget, 'video')
 
 	def _toggle_gpg(self):
 		if not self.gpg_is_active and not self.contact.keyID:
@@ -1938,8 +1954,11 @@ class ChatControl(ChatControlBase):
 		self._show_lock_image(self.gpg_is_active, 'GPG',
 			self.gpg_is_active, loggable, True)
 
-	def _show_lock_image(self, visible, enc_type = '', enc_enabled = False, chat_logged = False, authenticated = False):
-		'''Set lock icon visibility and create tooltip'''
+	def _show_lock_image(self, visible, enc_type = '', enc_enabled = False,
+			chat_logged = False, authenticated = False):
+		"""
+		Set lock icon visibility and create tooltip
+		"""
 		#encryption %s active
 		status_string = enc_enabled and _('is') or _('is NOT')
 		#chat session %s be logged
@@ -1948,11 +1967,12 @@ class ChatControl(ChatControlBase):
 		if authenticated:
 			#About encrypted chat session
 			authenticated_string = _('and authenticated')
-			self.lock_image.set_from_file(os.path.join(gajim.DATA_DIR, 'pixmaps', 'security-high.png'))
+			img_path = gtkgui_helpers.get_icon_path('gajim-security_high')
 		else:
 			#About encrypted chat session
 			authenticated_string = _('and NOT authenticated')
-			self.lock_image.set_from_file(os.path.join(gajim.DATA_DIR, 'pixmaps', 'security-low.png'))
+			img_path = gtkgui_helpers.get_icon_path('gajim-security_low')
+		self.lock_image.set_from_file(img_path)
 
 		#status will become 'is' or 'is not', authentificaed will become
 		#'and authentificated' or 'and not authentificated', logged will become
@@ -1974,7 +1994,9 @@ class ChatControl(ChatControlBase):
 
 	def send_message(self, message, keyID='', chatstate=None, xhtml=None,
 			process_commands=True):
-		'''Send a message to contact'''
+		"""
+		Send a message to contact
+		"""
 		if message in ('', None, '\n'):
 			return None
 
@@ -2038,10 +2060,11 @@ class ChatControl(ChatControlBase):
 			process_commands=process_commands)
 
 	def check_for_possible_paused_chatstate(self, arg):
-		''' did we move mouse of that window or write something in message
-		textview in the last 5 seconds?
-		if yes we go active for mouse, composing for kbd
-		if no we go paused if we were previously composing '''
+		"""
+		Did we move mouse of that window or write something in message textview
+		in the last 5 seconds? If yes - we go active for mouse, composing for
+		kbd.  If not - we go paused if we were previously composing
+		"""
 		contact = self.contact
 		jid = contact.jid
 		current_state = contact.our_chatstate
@@ -2065,10 +2088,10 @@ class ChatControl(ChatControlBase):
 		return True # loop forever
 
 	def check_for_possible_inactive_chatstate(self, arg):
-		''' did we move mouse over that window or wrote something in message
-		textview in the last 30 seconds?
-		if yes we go active
-		if no we go inactive '''
+		"""
+		Did we move mouse over that window or wrote something in message textview
+		in the last 30 seconds? if yes - we go active. If no - we go inactive
+		"""
 		contact = self.contact
 
 		current_state = contact.our_chatstate
@@ -2098,7 +2121,9 @@ class ChatControl(ChatControlBase):
 		ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
 
 	def print_esession_details(self):
-		'''print esession settings to textview'''
+		"""
+		Print esession settings to textview
+		"""
 		e2e_is_active = bool(self.session) and self.session.enable_encryption
 		if e2e_is_active:
 			msg = _('This session is encrypted')
@@ -2120,16 +2145,19 @@ class ChatControl(ChatControlBase):
 				self.session.is_loggable(), self.session and self.session.verified_identity)
 
 	def print_conversation(self, text, frm='', tim=None, encrypted=False,
-	subject=None, xhtml=None, simple=False, xep0184_id=None):
-		'''Print a line in the conversation:
-		if frm is set to status: it's a status message
-		if frm is set to error: it's an error message
-			The difference between status and error is mainly that with error, msg
-			count as a new message (in systray and in control).
-		if frm is set to info: it's a information message
-		if frm is set to print_queue: it is incomming from queue
-		if frm is set to another value: it's an outgoing message
-		if frm is not set: it's an incomming message'''
+			subject=None, xhtml=None, simple=False, xep0184_id=None):
+		"""
+		Print a line in the conversation
+
+		If frm is set to status: it's a status message.
+		if frm is set to error: it's an error message. The difference between
+			status and error is mainly that with error, msg count as a new message
+			(in systray and in control).
+		If frm is set to info: it's a information message.
+		If frm is set to print_queue: it is incomming from queue.
+		If frm is set to another value: it's an outgoing message.
+		If frm is not set: it's an incomming message.
+		"""
 		contact = self.contact
 
 		if frm == 'status':
@@ -2267,12 +2295,12 @@ class ChatControl(ChatControlBase):
 		return tab_img
 
 	def prepare_context_menu(self, hide_buttonbar_items=False):
-		'''sets compact view menuitem active state
-		sets active and sensitivity state for toggle_gpg_menuitem
-		sets sensitivity for history_menuitem (False for tranasports)
-		and file_transfer_menuitem
-		and hide()/show() for add_to_roster_menuitem
-		'''
+		"""
+		Set compact view menuitem active state sets active and sensitivity state
+		for toggle_gpg_menuitem sets sensitivity for history_menuitem (False for
+		tranasports) and file_transfer_menuitem and hide()/show() for
+		add_to_roster_menuitem
+		"""
 		menu = gui_menu_builder.get_contact_menu(self.contact, self.account,
 			use_multiple_contacts=False, show_start_chat=False,
 			show_encryption=True, control=self,
@@ -2280,9 +2308,11 @@ class ChatControl(ChatControlBase):
 		return menu
 
 	def send_chatstate(self, state, contact = None):
-		''' sends OUR chatstate as STANDLONE chat state message (eg. no body)
+		"""
+		Send OUR chatstate as STANDLONE chat state message (eg. no body)
 		to contact only if new chatstate is different from the previous one
-		if jid is not specified, send to active tab'''
+		if jid is not specified, send to active tab
+		"""
 		# JEP 85 does not allow resending the same chatstate
 		# this function checks for that and just returns so it's safe to call it
 		# with same state.
@@ -2374,6 +2404,9 @@ class ChatControl(ChatControlBase):
 		self.contact.chatstate = None
 		self.contact.our_chatstate = None
 
+		for jingle_type in ('audio', 'video'):
+			self.close_jingle_content(jingle_type)
+
 		# disconnect self from session
 		if self.session:
 			self.session.control = None
@@ -2435,7 +2468,9 @@ class ChatControl(ChatControlBase):
 		on_yes(self)
 
 	def handle_incoming_chatstate(self):
-		''' handle incoming chatstate that jid SENT TO us '''
+		"""
+		Handle incoming chatstate that jid SENT TO us
+		"""
 		self.draw_banner_text()
 		# update chatstate in tab for this chat
 		self.parent_win.redraw_tab(self, self.contact.chatstate)
@@ -2455,24 +2490,12 @@ class ChatControl(ChatControlBase):
 			# Re-show the small avatar
 			self.show_avatar()
 
-	def show_avatar(self, resource = None):
+	def show_avatar(self):
 		if not gajim.config.get('show_avatar_in_chat'):
 			return
-
-		is_fake = False
-		if self.TYPE_ID == message_control.TYPE_PM:
-			is_fake = True
-			jid_with_resource = self.contact.jid # fake jid
-		else:
-			jid_with_resource = self.contact.jid
-			if resource:
-				jid_with_resource += '/' + resource
-
-		# we assume contact has no avatar
-		scaled_pixbuf = None
-
-		pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid_with_resource,
-			is_fake)
+		
+		jid_with_resource = self.contact.get_full_jid()
+		pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid_with_resource)
 		if pixbuf == 'ask':
 			# we don't have the vcard
 			if self.TYPE_ID == message_control.TYPE_PM:
@@ -2488,8 +2511,10 @@ class ChatControl(ChatControlBase):
 			else:
 				gajim.connections[self.account].request_vcard(jid_with_resource)
 			return
-		if pixbuf is not None:
+		elif pixbuf:
 			scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'chat')
+		else:
+			scaled_pixbuf = None
 
 		image = self.xml.get_widget('avatar_image')
 		image.set_from_pixbuf(scaled_pixbuf)
@@ -2617,8 +2642,9 @@ class ChatControl(ChatControlBase):
 			self.conv_textview.print_empty_line()
 
 	def read_queue(self):
-		'''read queue and print messages containted in it'''
-
+		"""
+		Read queue and print messages containted in it
+		"""
 		jid = self.contact.jid
 		jid_with_resource = jid
 		if self.resource:
@@ -2673,16 +2699,15 @@ class ChatControl(ChatControlBase):
 				control.remove_contact(nick)
 
 	def show_bigger_avatar(self, small_avatar):
-		'''resizes the avatar, if needed, so it has at max half the screen size
-		and shows it'''
+		"""
+		Resize the avatar, if needed, so it has at max half the screen size and
+		shows it
+		"""
 		if not small_avatar.window:
 			# Tab has been closed since we hovered the avatar
 			return
-		is_fake = False
-		if self.type_id == message_control.TYPE_PM:
-			is_fake = True
 		avatar_pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(
-			self.contact.jid, is_fake)
+			self.contact.jid)
 		if avatar_pixbuf in ('ask', None):
 			return
 		# Hide the small avatar
@@ -2741,14 +2766,18 @@ class ChatControl(ChatControlBase):
 		window.show_all()
 
 	def _on_window_avatar_leave_notify_event(self, widget, event):
-		'''we just left the popup window that holds avatar'''
+		"""
+		Just left the popup window that holds avatar
+		"""
 		self.bigger_avatar_window.destroy()
 		self.bigger_avatar_window = None
 		# Re-show the small avatar
 		self.show_avatar()
 
 	def _on_window_motion_notify_event(self, widget, event):
-		'''we just moved the mouse so show the cursor'''
+		"""
+		Just moved the mouse so show the cursor
+		"""
 		cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
 		self.bigger_avatar_window.window.set_cursor(cursor)
 
@@ -2765,7 +2794,9 @@ class ChatControl(ChatControlBase):
 		self._toggle_gpg()
 
 	def _on_convert_to_gc_menuitem_activate(self, widget):
-		'''user want to invite some friends to chat'''
+		"""
+		User wants to invite some friends to chat
+		"""
 		dialogs.TransformChatToMUC(self.account, [self.contact.jid])
 
 	def _on_toggle_e2e_menuitem_activate(self, widget):
@@ -2806,7 +2837,9 @@ class ChatControl(ChatControlBase):
 		self.draw_banner()
 
 	def update_status_display(self, name, uf_show, status):
-		'''print the contact's status and update the status/GPG image'''
+		"""
+		Print the contact's status and update the status/GPG image
+		"""
 		self.update_ui()
 		self.parent_win.redraw_tab(self)
 
diff --git a/src/command_system/__init__.py b/src/command_system/__init__.py
index c0a48f863..ff61c186e 100644
--- a/src/command_system/__init__.py
+++ b/src/command_system/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
diff --git a/src/command_system/dispatching.py b/src/command_system/dispatching.py
index 2bfd76b96..7f365a915 100644
--- a/src/command_system/dispatching.py
+++ b/src/command_system/dispatching.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
diff --git a/src/command_system/errors.py b/src/command_system/errors.py
index 992e83ccf..4281e9fd7 100644
--- a/src/command_system/errors.py
+++ b/src/command_system/errors.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
@@ -20,13 +20,18 @@ class BaseError(Exception):
     """
 
     def __init__(self, message, command=None, name=None):
+        self.message = message
+
         self.command = command
         self.name = name
 
         if command and not name:
             self.name = command.first_name
 
-        super(BaseError, self).__init__(message)
+        super(BaseError, self).__init__()
+
+    def __str__(self):
+        return self.message
 
 class DefinitionError(BaseError):
     """
diff --git a/src/command_system/framework.py b/src/command_system/framework.py
index db9eb2e78..30f5cd53c 100644
--- a/src/command_system/framework.py
+++ b/src/command_system/framework.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
diff --git a/src/command_system/implementation/__init__.py b/src/command_system/implementation/__init__.py
index 66d097f42..c77c23e3f 100644
--- a/src/command_system/implementation/__init__.py
+++ b/src/command_system/implementation/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
diff --git a/src/command_system/implementation/custom.py b/src/command_system/implementation/custom.py
index 4f54670da..e4aa32dbf 100644
--- a/src/command_system/implementation/custom.py
+++ b/src/command_system/implementation/custom.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
diff --git a/src/command_system/implementation/hosts.py b/src/command_system/implementation/hosts.py
index b38bb1a35..a90dab464 100644
--- a/src/command_system/implementation/hosts.py
+++ b/src/command_system/implementation/hosts.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
diff --git a/src/command_system/implementation/middleware.py b/src/command_system/implementation/middleware.py
index 9ef4bea29..2f262f8ed 100644
--- a/src/command_system/implementation/middleware.py
+++ b/src/command_system/implementation/middleware.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
diff --git a/src/command_system/implementation/standard.py b/src/command_system/implementation/standard.py
index 8afa044e5..91bfbc8e9 100644
--- a/src/command_system/implementation/standard.py
+++ b/src/command_system/implementation/standard.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
@@ -17,10 +17,14 @@
 Provides an actual implementation for the standard commands.
 """
 
+from time import localtime, strftime
+from datetime import date
+
 import dialogs
 from common import gajim
 from common import helpers
 from common.exceptions import GajimGeneralException
+from common.logger import Constants
 
 from ..errors import CommandError
 from ..framework import CommandContainer, command, documentation
@@ -28,6 +32,10 @@ from ..mapping import generate_usage
 
 from hosts import ChatCommands, PrivateChatCommands, GroupChatCommands
 
+# This holds constants fron the logger, which we'll be using in some of our
+# commands.
+lc = Constants()
+
 class StandardCommonCommands(CommandContainer):
     """
     This command container contains standard commands which are common to all -
@@ -84,6 +92,71 @@ class StandardCommonCommands(CommandContainer):
     def me(self, action):
         self.send("/me %s" % action)
 
+    @command('lastlog', overlap=True)
+    @documentation(_("Show logged messages which mention given text"))
+    def grep(self, text, limit=None):
+        results = gajim.logger.get_search_results_for_query(self.contact.jid,
+                text, self.account)
+
+        if not results:
+            raise CommandError(_("%s: Nothing found") % text)
+
+        if limit:
+            try:
+                results = results[len(results) - int(limit):]
+            except ValueError:
+                raise CommandError(_("Limit must be an integer"))
+
+        for row in results:
+            contact, time, kind, show, message, subject = row
+
+            if not contact:
+                if kind == lc.KIND_CHAT_MSG_SENT:
+                    contact = gajim.nicks[self.account]
+                else:
+                    contact = self.contact.name
+
+            time_obj = localtime(time)
+            date_obj = date.fromtimestamp(time)
+            date_ = strftime('%Y-%m-%d', time_obj)
+            time_ = strftime('%H:%M:%S', time_obj)
+
+            if date_obj == date.today():
+                formatted = "[%s] %s: %s" % (time_, contact, message)
+            else:
+                formatted = "[%s, %s] %s: %s" % (date_, time_, contact, message)
+
+            self.echo(formatted)
+
+    @command(raw=True, empty=True)
+    @documentation(_("""
+    Set current the status
+
+    Status can be given as one of the following values: online, away,
+    chat, xa, dnd.
+    """))
+    def status(self, status, message):
+        if status not in ('online', 'away', 'chat', 'xa', 'dnd'):
+            raise CommandError("Invalid status given")
+        for connection in gajim.connections.itervalues():
+            connection.change_status(status, message)
+
+    @command(raw=True, empty=True)
+    @documentation(_("Set the current status to away"))
+    def away(self, message):
+        if not message:
+            message = _("Away")
+        for connection in gajim.connections.itervalues():
+            connection.change_status('away', message)
+
+    @command('back', raw=True, empty=True)
+    @documentation(_("Set the current status to online"))
+    def online(self, message):
+        if not message:
+            message = _("Available")
+        for connection in gajim.connections.itervalues():
+            connection.change_status('online', message)
+
 class StandardChatCommands(CommandContainer):
     """
     This command container contains standard command which are unique to a chat.
@@ -98,7 +171,7 @@ class StandardChatCommands(CommandContainer):
             raise CommandError(_('Command is not supported for zeroconf accounts'))
         gajim.connections[self.account].sendPing(self.contact)
 
-    @command('dtmf')
+    @command
     @documentation(_("Sends DTMF events through an open audio session"))
     def dtmf(self, events):
         if not self.audio_sid:
@@ -114,7 +187,7 @@ class StandardChatCommands(CommandContainer):
         else:
             raise CommandError(_("No valid DTMF event specified"))
 
-    @command('audio')
+    @command
     @documentation(_("Toggle audio session"))
     def audio(self):
         if self.audio_state == self.JINGLE_STATE_NOT_AVAILABLE:
@@ -125,7 +198,7 @@ class StandardChatCommands(CommandContainer):
             state = self._audio_button.get_active()
             self._audio_button.set_active(not state)
 
-    @command('video')
+    @command
     @documentation(_("Toggle video session"))
     def video(self):
         if self.video_state == self.JINGLE_STATE_NOT_AVAILABLE:
diff --git a/src/command_system/mapping.py b/src/command_system/mapping.py
index 707866a20..ecf8f0783 100644
--- a/src/command_system/mapping.py
+++ b/src/command_system/mapping.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  red-agent <hell.director@gmail.com>
+# Copyright (C) 2009  Alexander Cherniuk <ts33kr@gmail.com>
 #
 # 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
diff --git a/src/common/GnuPG.py b/src/common/GnuPG.py
index f6d8e7e2b..64abe75ce 100644
--- a/src/common/GnuPG.py
+++ b/src/common/GnuPG.py
@@ -213,7 +213,9 @@ if gajim.HAVE_GPG:
 			return self.get_keys(True)
 
 		def _stripHeaderFooter(self, data):
-			"""Remove header and footer from data"""
+			"""
+			Remove header and footer from data
+			"""
 			if not data: return ''
 			lines = data.split('\n')
 			while lines[0] != '':
@@ -229,7 +231,9 @@ if gajim.HAVE_GPG:
 			return line
 
 		def _addHeaderFooter(self, data, type_):
-			"""Add header and footer from data"""
+			"""
+			Add header and footer from data
+			"""
 			out = "-----BEGIN PGP %s-----\n" % type_
 			out = out + "Version: PGP\n"
 			out = out + "\n"
diff --git a/src/common/GnuPGInterface.py b/src/common/GnuPGInterface.py
index d91f776e3..aa4a9eeee 100644
--- a/src/common/GnuPGInterface.py
+++ b/src/common/GnuPGInterface.py
@@ -21,7 +21,8 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-"""Interface to GNU Privacy Guard (GnuPG)
+"""
+Interface to GNU Privacy Guard (GnuPG)
 
 GnuPGInterface is a Python module to interface with GnuPG.
 It concentrates on interacting with GnuPG via filehandles,
@@ -249,7 +250,8 @@ _fd_options = { 'passphrase': '--passphrase-fd',
                 'command':    '--command-fd' }
 
 class GnuPG:
-    """Class instances represent GnuPG.
+    """
+    Class instances represent GnuPG
 
     Instance attributes of a GnuPG object are:
 
@@ -275,8 +277,10 @@ class GnuPG:
         self.options = Options()
 
     def run(self, gnupg_commands, args=None, create_fhs=None, attach_fhs=None):
-        """Calls GnuPG with the list of string commands gnupg_commands,
-        complete with prefixing dashes.
+        """
+        Calls GnuPG with the list of string commands gnupg_commands, complete
+        with prefixing dashes
+
         For example, gnupg_commands could be
         '["--sign", "--encrypt"]'
         Returns a GnuPGInterface.Process object.
@@ -336,7 +340,6 @@ class GnuPG:
         is a FileObject connected to GnuPG's standard input,
         and can be written to.
         """
-
         if args is None: args = []
         if create_fhs is None: create_fhs = []
         if attach_fhs is None: attach_fhs = {}
@@ -367,9 +370,10 @@ class GnuPG:
 
 
     def _attach_fork_exec(self, gnupg_commands, args, create_fhs, attach_fhs):
-        """This is like run(), but without the passphrase-helping
-        (note that run() calls this)."""
-
+        """
+        This is like run(), but without the passphrase-helping (note that run()
+        calls this)
+        """
         process = Process()
 
         for fh_name in create_fhs + attach_fhs.keys():
@@ -404,7 +408,9 @@ class GnuPG:
 
 
     def _as_parent(self, process):
-        """Stuff run after forking in parent"""
+        """
+        Stuff run after forking in parent
+        """
         for k, p in process._pipes.items():
             if not p.direct:
                 os.close(p.child)
@@ -417,7 +423,9 @@ class GnuPG:
 
 
     def _as_child(self, process, gnupg_commands, args):
-        """Stuff run after forking in child"""
+        """
+        Stuff run after forking in child
+        """
         # child
         for std in _stds:
             p = process._pipes[std]
@@ -444,7 +452,10 @@ class GnuPG:
 
 
 class Pipe:
-    """simple struct holding stuff about pipes we use"""
+    """
+    Simple struct holding stuff about pipes we use
+    """
+
     def __init__(self, parent, child, direct):
         self.parent = parent
         self.child = child
@@ -452,7 +463,8 @@ class Pipe:
 
 
 class Options:
-    """Objects of this class encompass options passed to GnuPG.
+    """
+    Objects of this class encompass options passed to GnuPG.
     This class is responsible for determining command-line arguments
     which are based on options.  It can be said that a GnuPG
     object has-a Options object in its options attribute.
@@ -522,7 +534,6 @@ class Options:
     >>> gnupg.options.get_args()
     ['--armor', '--recipient', 'Alice', '--recipient', 'Bob', '--no-secmem-warning']
     """
-
     def __init__(self):
         # booleans
         self.armor = 0
@@ -558,12 +569,15 @@ class Options:
         self.extra_args = []
 
     def get_args( self ):
-        """Generate a list of GnuPG arguments based upon attributes."""
-
+        """
+        Generate a list of GnuPG arguments based upon attributes
+        """
         return self.get_meta_args() + self.get_standard_args() + self.extra_args
 
     def get_standard_args( self ):
-        """Generate a list of standard, non-meta or extra arguments"""
+        """
+        Generate a list of standard, non-meta or extra arguments
+        """
         args = []
         if self.homedir is not None:
             args.extend( [ '--homedir', self.homedir ] )
@@ -595,7 +609,9 @@ class Options:
         return args
 
     def get_meta_args( self ):
-        """Get a list of generated meta-arguments"""
+        """
+        Get a list of generated meta-arguments
+        """
         args = []
 
         if self.meta_pgp_5_compatible: args.extend( [ '--compress-algo', '1',
@@ -608,8 +624,9 @@ class Options:
 
 
 class Process:
-    """Objects of this class encompass properties of a GnuPG
-    process spawned by GnuPG.run().
+    """
+    Objects of this class encompass properties of a GnuPG process spawned by
+    GnuPG.run()
 
     # gnupg is a GnuPG object
     process = gnupg.run( [ '--decrypt' ], stdout = 1 )
@@ -637,9 +654,10 @@ class Process:
         self._waited = None
 
     def wait(self):
-        """Wait on the process to exit, allowing for child cleanup.
-        Will raise an IOError if the process exits non-zero."""
-
+        """
+        Wait on the process to exit, allowing for child cleanup.  Will raise an
+        IOError if the process exits non-zero
+        """
         e = os.waitpid(self.pid, 0)[1]
         if e != 0:
             raise IOError, "GnuPG exited non-zero, with code %d" % (e << 8)
diff --git a/src/common/account.py b/src/common/account.py
index 1c080cad8..4db660165 100644
--- a/src/common/account.py
+++ b/src/common/account.py
@@ -19,14 +19,14 @@
 ##
 
 class Account(object):
-	
+
 	def __init__(self, name, contacts, gc_contacts):
 		self.name = name
 		self.contacts = contacts
 		self.gc_contacts = gc_contacts
-		
+
 	def __repr__(self):
 		return self.name
-	
+
 	def __hash__(self):
-		return self.name.__hash__()
-\ No newline at end of file
+		return hash(self.name)
diff --git a/src/common/atom.py b/src/common/atom.py
index 18122e9d1..689df5cee 100644
--- a/src/common/atom.py
+++ b/src/common/atom.py
@@ -20,9 +20,11 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-''' Atom (rfc 4287) feed parser, used to read data from atom-over-pubsub transports
+"""
+Atom (rfc 4287) feed parser, used to read data from atom-over-pubsub transports
 and services. Very simple. Actually implements only atom:entry. Implement more features
-if you need. '''
+if you need
+"""
 
 # suggestion: rewrite functions that return dates to return standard python time tuples,
 # exteneded to contain timezone
@@ -31,8 +33,11 @@ import xmpp
 import time
 
 class PersonConstruct(xmpp.Node, object):
-	''' Not used for now, as we don't need authors/contributors in pubsub.com feeds.
-	They rarely exist there. '''
+	"""
+	Not used for now, as we don't need authors/contributors in pubsub.com feeds.
+	They rarely exist there
+	"""
+
 	def __init__(self, node):
 		''' Create person construct from node. '''
 		xmpp.Node.__init__(self, node=node)
@@ -60,15 +65,17 @@ class PersonConstruct(xmpp.Node, object):
 
 class Entry(xmpp.Node, object):
 	def __init__(self, node=None):
-		''' Create new atom entry object. '''
 		xmpp.Node.__init__(self, 'entry', node=node)
 
 	def __repr__(self):
 		return '<Atom:Entry object of id="%r">' % self.getAttr('id')
 
 class OldEntry(xmpp.Node, object):
-	''' Parser for feeds from pubsub.com. They use old Atom 0.3 format with
-	their extensions. '''
+	"""
+	Parser for feeds from pubsub.com. They use old Atom 0.3 format with their
+	extensions
+	"""
+
 	def __init__(self, node=None):
 		''' Create new Atom 0.3 entry object. '''
 		xmpp.Node.__init__(self, 'entry', node=node)
@@ -77,8 +84,10 @@ class OldEntry(xmpp.Node, object):
 		return '<Atom0.3:Entry object of id="%r">' % self.getAttr('id')
 
 	def get_feed_title(self):
-		''' Returns title of feed, where the entry was created. The result is the feed name
-		concatenated with source-feed title. '''
+		"""
+		Return title of feed, where the entry was created. The result is the feed
+		name concatenated with source-feed title
+		"""
 		if self.parent is not None:
 			main_feed = self.parent.getTagData('title')
 		else:
@@ -104,7 +113,9 @@ class OldEntry(xmpp.Node, object):
 		which delivered this entry. ''')
 
 	def get_feed_link(self):
-		''' Get source link '''
+		"""
+		Get source link
+		"""
 		try:
 			return self.getTag('feed').getTags('link',{'rel':'alternate'})[1].getData()
 		except Exception:
@@ -114,15 +125,19 @@ class OldEntry(xmpp.Node, object):
 		''' Link to main webpage of the feed. ''')
 
 	def get_title(self):
-		''' Get an entry's title. '''
+		"""
+		Get an entry's title
+		"""
 		return self.getTagData('title')
 
 	title = property(get_title, None, None,
 		''' Entry's title. ''')
 
 	def get_uri(self):
-		''' Get the uri the entry points to (entry's first link element with rel='alternate'
-		or without rel attribute). '''
+		"""
+		Get the uri the entry points to (entry's first link element with
+		rel='alternate' or without rel attribute)
+		"""
 		for element in self.getTags('link'):
 			if 'rel' in element.attrs and element.attrs['rel']!='alternate': continue
 			try:
@@ -135,12 +150,16 @@ class OldEntry(xmpp.Node, object):
 		''' URI that is pointed by the entry. ''')
 
 	def get_updated(self):
-		''' Get the time the entry was updated last time. This should be standarized,
-		but pubsub.com sends it in human-readable format. We won't try to parse it.
-		(Atom 0.3 uses the word	«modified» for that).
+		"""
+		Get the time the entry was updated last time
+
+		This should be standarized, but pubsub.com sends it in human-readable
+		format. We won't try to parse it. (Atom 0.3 uses the word «modified» for
+		that).
 
 		If there's no time given in the entry, we try with <published>
-		and <issued> elements. '''
+		and <issued> elements.
+		"""
 		for name in ('updated', 'modified', 'published', 'issued'):
 			date = self.getTagData(name)
 			if date is not None: break
diff --git a/src/common/caps.py b/src/common/caps_cache.py
index f34dfcda4..603c348cb 100644
--- a/src/common/caps.py
+++ b/src/common/caps_cache.py
@@ -1,5 +1,5 @@
 # -*- coding:utf-8 -*-
-## src/common/caps.py
+## src/common/caps_cache.py
 ##
 ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org>
 ##                    Travis Shirk <travis AT pobox.com>
@@ -23,22 +23,22 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-'''
-Module containing all XEP-115 (Entity Capabilities) related classes 
+"""
+Module containing all XEP-115 (Entity Capabilities) related classes
 
 Basic Idea:
 CapsCache caches features to hash relationships. The cache is queried
-through ClientCaps objects which are hold by contact instances. 
-''' 
+through ClientCaps objects which are hold by contact instances.
+"""
 
-import gajim
-import helpers
 import base64
 import hashlib
 
-from common.xmpp import NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES
-from common.xmpp import NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO
-from common.xmpp import NS_JINGLE_RTP_VIDEO
+import logging
+log = logging.getLogger('gajim.c.caps_cache')
+
+from common.xmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES,
+	NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS)
 # Features where we cannot safely assume that the other side supports them
 FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION,
 	NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO]
@@ -47,6 +47,7 @@ FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION,
 NEW = 0
 QUERIED = 1
 CACHED = 2 # got the answer
+FAKED = 3 # allow NullClientCaps to behave as it has a cached item
 
 ################################################################################
 ### Public API of this module
@@ -54,7 +55,9 @@ CACHED = 2 # got the answer
 
 capscache = None
 def initialize(logger):
-	''' Initializes this module '''
+	"""
+	Initialize this module
+	"""
 	global capscache
 	capscache = CapsCache(logger)
 
@@ -65,19 +68,34 @@ def client_supports(client_caps, requested_feature):
 	supported_features = cache_item.features
 	if requested_feature in supported_features:
 		return True
-	elif supported_features == [] and cache_item.status in (NEW, QUERIED):
+	elif not supported_features and cache_item.status in (NEW, QUERIED, FAKED):
 		# assume feature is supported, if we don't know yet, what the client
 		# is capable of
 		return requested_feature not in FEATURE_BLACKLIST
 	else:
 		return False
+	
+def create_suitable_client_caps(node, caps_hash, hash_method):
+	"""
+	Create and return a suitable ClientCaps object for the given node,
+	caps_hash, hash_method combination.
+	"""
+	if not node or not caps_hash:
+		# improper caps, ignore client capabilities.
+		client_caps = NullClientCaps()
+	elif not hash_method:
+		client_caps = OldClientCaps(caps_hash, node)
+	else:
+		client_caps = ClientCaps(caps_hash, node, hash_method)
+	return client_caps
 
 def compute_caps_hash(identities, features, dataforms=[], hash_method='sha-1'):
-	'''Compute caps hash according to XEP-0115, V1.5
+	"""
+	Compute caps hash according to XEP-0115, V1.5
 
 	dataforms are xmpp.DataForms objects as common.dataforms don't allow several
-	values without a field type list-multi'''
-	
+	values without a field type list-multi
+	"""
 	def sort_identities_func(i1, i2):
 		cat1 = i1['category']
 		cat2 = i2['category']
@@ -98,14 +116,14 @@ def compute_caps_hash(identities, features, dataforms=[], hash_method='sha-1'):
 		if lang1 > lang2:
 			return 1
 		return 0
-	
+
 	def sort_dataforms_func(d1, d2):
 		f1 = d1.getField('FORM_TYPE')
 		f2 = d2.getField('FORM_TYPE')
 		if f1 and f2 and (f1.getValue() < f2.getValue()):
 			return -1
 		return 1
-	
+
 	S = ''
 	identities.sort(cmp=sort_identities_func)
 	for i in identities:
@@ -140,108 +158,126 @@ def compute_caps_hash(identities, features, dataforms=[], hash_method='sha-1'):
 	else:
 		return ''
 	return base64.b64encode(hash_.digest())
-	
+
 
 ################################################################################
 ### Internal classes of this module
 ################################################################################
 
 class AbstractClientCaps(object):
-	'''
-	Base class representing a client and its capabilities as advertised by
-	a caps tag in a presence. 
-	'''
+	"""
+	Base class representing a client and its capabilities as advertised by a
+	caps tag in a presence
+	"""
 	def __init__(self, caps_hash, node):
 		self._hash = caps_hash
 		self._node = node
-		
+
 	def get_discover_strategy(self):
 		return self._discover
-							
+
 	def _discover(self, connection, jid):
-		''' To be implemented by subclassess '''
-		raise NotImplementedError()
-	
+		"""
+		To be implemented by subclassess
+		"""
+		raise NotImplementedError
+
 	def get_cache_lookup_strategy(self):
 		return self._lookup_in_cache
-	
+
 	def _lookup_in_cache(self, caps_cache):
-		''' To be implemented by subclassess '''
-		raise NotImplementedError()
-	
+		"""
+		To be implemented by subclassess
+		"""
+		raise NotImplementedError
+
 	def get_hash_validation_strategy(self):
 		return self._is_hash_valid
-					
+
 	def _is_hash_valid(self, identities, features, dataforms):
-		''' To be implemented by subclassess '''
-		raise NotImplementedError()		
+		"""
+		To be implemented by subclassess
+		"""
+		raise NotImplementedError
 
 
 class ClientCaps(AbstractClientCaps):
-	''' The current XEP-115 implementation '''
-	
+	"""
+	The current XEP-115 implementation
+	"""
 	def __init__(self, caps_hash, node, hash_method):
 		AbstractClientCaps.__init__(self, caps_hash, node)
 		assert hash_method != 'old'
 		self._hash_method = hash_method
-	
+
 	def _lookup_in_cache(self, caps_cache):
 		return caps_cache[(self._hash_method, self._hash)]
-	
+
 	def _discover(self, connection, jid):
 		connection.discoverInfo(jid, '%s#%s' % (self._node, self._hash))
-				
+
 	def _is_hash_valid(self, identities, features, dataforms):
 		computed_hash = compute_caps_hash(identities, features,
 				dataforms=dataforms, hash_method=self._hash_method)
-		return computed_hash == self._hash	
+		return computed_hash == self._hash
+
 
-	
 class OldClientCaps(AbstractClientCaps):
-	''' Old XEP-115 implemtation. Kept around for background competability.  '''
-	
+	"""
+	Old XEP-115 implemtation. Kept around for background competability
+	"""
 	def __init__(self, caps_hash, node):
 		AbstractClientCaps.__init__(self, caps_hash, node)
 
 	def _lookup_in_cache(self, caps_cache):
 		return caps_cache[('old', self._node + '#' + self._hash)]
-	
+
 	def _discover(self, connection, jid):
 		connection.discoverInfo(jid)
-		
+
 	def _is_hash_valid(self, identities, features, dataforms):
-		return True	
+		return True
+
 
-		
 class NullClientCaps(AbstractClientCaps):
-	'''
+	"""
 	This is a NULL-Object to streamline caps handling if a client has not
-	advertised any caps or has advertised them in an improper way. 
-	
+	advertised any caps or has advertised them in an improper way
+
 	Assumes (almost) everything is supported.
-	''' 
-	
+	"""
+	_instance = None
+	def __new__(cls, *args, **kwargs):
+		"""
+		Make it a singleton.
+		"""
+		if not cls._instance:
+			cls._instance = super(NullClientCaps, cls).__new__(
+				cls, *args, **kwargs)
+		return cls._instance
+
 	def __init__(self):
 		AbstractClientCaps.__init__(self, None, None)
-	
+
 	def _lookup_in_cache(self, caps_cache):
 		# lookup something which does not exist to get a new CacheItem created
 		cache_item = caps_cache[('dummy', '')]
-		assert cache_item.status != CACHED
+		# Mark the item as cached so that protocol/caps.py does not update it
+		cache_item.status = FAKED
 		return cache_item
-	
+
 	def _discover(self, connection, jid):
 		pass
 
 	def _is_hash_valid(self, identities, features, dataforms):
-		return False	
+		return False
 
 
 class CapsCache(object):
-	''' 
-	This object keeps the mapping between caps data and real disco
-	features they represent, and provides simple way to query that info.
-	'''
+	"""
+	This object keeps the mapping between caps data and real disco features they
+	represent, and provides simple way to query that info
+	"""
 	def __init__(self, logger=None):
 		# our containers:
 		# __cache is a dictionary mapping: pair of hash method and hash maps
@@ -255,7 +291,7 @@ class CapsCache(object):
 			#   another object, and we will have plenty of identical long
 			#   strings. therefore we can cache them
 			__names = {}
-			
+
 			def __init__(self, hash_method, hash_, logger):
 				# cached into db
 				self.hash_method = hash_method
@@ -274,7 +310,7 @@ class CapsCache(object):
 				self._features = []
 				for feature in value:
 					self._features.append(self.__names.setdefault(feature, feature))
-					
+
 			features = property(_get_features, _set_features)
 
 			def _get_identities(self):
@@ -291,7 +327,7 @@ class CapsCache(object):
 						d['name'] = i[3]
 					list_.append(d)
 				return list_
-			
+
 			def _set_identities(self, value):
 				self._identities = []
 				for identity in value:
@@ -299,7 +335,7 @@ class CapsCache(object):
 					t = (identity['category'], identity.get('type'),
 						identity.get('xml:lang'), identity.get('name'))
 					self._identities.append(self.__names.setdefault(t, t))
-					
+
 			identities = property(_get_identities, _set_identities)
 
 			def set_and_store(self, identities, features):
@@ -308,11 +344,18 @@ class CapsCache(object):
 				self._logger.add_caps_entry(self.hash_method, self.hash,
 					identities, features)
 				self.status = CACHED
-				
+
 			def update_last_seen(self):
 				if not self._recently_seen:
 					self._recently_seen = True
 					self._logger.update_caps_time(self.hash_method, self.hash)
+			
+			def is_valid(self):
+				"""
+				Returns True if identities and features for this cache item
+				are known.
+				""" 
+				return self.status in (CACHED, FAKED)
 
 		self.__CacheItem = CacheItem
 		self.logger = logger
@@ -325,9 +368,11 @@ class CapsCache(object):
 			x.identities = identities
 			x.features = features
 			x.status = CACHED
-	
+
 	def _remove_outdated_caps(self):
-		'''Removes outdated values from the db'''
+		"""
+		Remove outdated values from the db
+		"""
 		self.logger.clean_caps_table()
 
 	def __getitem__(self, caps):
@@ -341,96 +386,20 @@ class CapsCache(object):
 		return x
 
 	def query_client_of_jid_if_unknown(self, connection, jid, client_caps):
-		'''
-		Start a disco query to determine caps (node, ver, exts).
-		Won't query if the data is already in cache.
-		'''
+		"""
+		Start a disco query to determine caps (node, ver, exts). Won't query if
+		the data is already in cache
+		"""
 		lookup_cache_item = client_caps.get_cache_lookup_strategy()
-		q = lookup_cache_item(self)	
-		
+		q = lookup_cache_item(self)
+
 		if q.status == NEW:
 			# do query for bare node+hash pair
 			# this will create proper object
 			q.status = QUERIED
 			discover = client_caps.get_discover_strategy()
 			discover(connection, jid)
-		else: 
-			q.update_last_seen()
-
-################################################################################
-### Caps network coding
-################################################################################
-
-class ConnectionCaps(object):
-	'''
-	This class highly depends on that it is a part of Connection class.
-	'''
-	def _capsPresenceCB(self, con, presence):
-		'''
-		Handle incoming presence stanzas... This is a callback for xmpp
-		registered in connection_handlers.py
-		'''
-		# we will put these into proper Contact object and ask
-		# for disco... so that disco will learn how to interpret
-		# these caps
-		pm_ctrl = None
-		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)
-			contact = gajim.contacts.get_gc_contact(
-				self.name, room_jid, nick)
-			pm_ctrl = gajim.interface.msg_win_mgr.get_control(jid, self.name)
-			if contact is None:
-				# TODO: a way to put contact not-in-roster
-				# into Contacts
-				return
-
-		caps_tag = presence.getTag('c')
-		if not caps_tag:
-			# presence did not contain caps_tag
-			client_caps = NullClientCaps()
 		else:
-			hash_method, node, caps_hash = caps_tag['hash'], caps_tag['node'], caps_tag['ver']
-
-			if not node or not caps_hash:
-				# improper caps in stanza, ignore client capabilities.
-				client_caps = NullClientCaps()
-			elif not hash_method:
-				client_caps = OldClientCaps(caps_hash, node)
-			else:
-				client_caps = ClientCaps(caps_hash, node, hash_method)
-
-		capscache.query_client_of_jid_if_unknown(self, jid, client_caps)
-		contact.client_caps = client_caps
-
-		if pm_ctrl:
-			pm_ctrl.update_contact()
-
-	def _capsDiscoCB(self, jid, node, identities, features, dataforms):		
-		contact = gajim.contacts.get_contact_from_full_jid(self.name, jid)
-		if not contact:
-			room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
-			contact = gajim.contacts.get_gc_contact(self.name, room_jid, nick)
-			if contact is None:
-				return
-
-		lookup = contact.client_caps.get_cache_lookup_strategy()
-		cache_item = lookup(capscache)	
-					
-		if cache_item.status == CACHED:
-			return
-		else:
-			validate = contact.client_caps.get_hash_validation_strategy()
-			hash_is_valid = validate(identities, features, dataforms)
-			
-			if hash_is_valid:
-				cache_item.set_and_store(identities, features)
-			else:
-				contact.client_caps = NullClientCaps()
+			q.update_last_seen()
 
 # vim: se ts=3:
diff --git a/src/common/check_paths.py b/src/common/check_paths.py
index 0ea19a030..d50158b43 100644
--- a/src/common/check_paths.py
+++ b/src/common/check_paths.py
@@ -27,18 +27,11 @@ import os
 import sys
 import stat
 
-import exceptions
 from common import gajim
 import logger
 
 # DO NOT MOVE ABOVE OF import gajim
-try:
-	import sqlite3 as sqlite # python 2.5
-except ImportError:
-	try:
-		from pysqlite2 import dbapi2 as sqlite
-	except ImportError:
-		raise exceptions.PysqliteNotAvailable
+import sqlite3 as sqlite
 
 def create_log_db():
 	print _('creating logs database')
@@ -86,7 +79,7 @@ def create_log_db():
 			subject TEXT
 		);
 
-		CREATE INDEX idx_logs_jid_id_kind ON logs (jid_id, kind);
+		CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC);
 
 		CREATE TABLE caps_cache (
 			hash_method TEXT,
diff --git a/src/common/commands.py b/src/common/commands.py
index 71b0300bc..07c866194 100644
--- a/src/common/commands.py
+++ b/src/common/commands.py
@@ -34,10 +34,13 @@ class AdHocCommand:
 
 	@staticmethod
 	def isVisibleFor(samejid):
-		''' This returns True if that command should be visible and invokable
-		for others.
+		"""
+		This returns True if that command should be visible and invokable for
+		others
+
 		samejid - True when command is invoked by an entity with the same bare
-		jid.'''
+		jid.
+		"""
 		return True
 
 	def __init__(self, conn, jid, sessionid):
@@ -80,7 +83,9 @@ class ChangeStatusCommand(AdHocCommand):
 
 	@staticmethod
 	def isVisibleFor(samejid):
-		''' Change status is visible only if the entity has the same bare jid. '''
+		"""
+		Change status is visible only if the entity has the same bare jid
+		"""
 		return samejid
 
 	def execute(self, request):
@@ -177,7 +182,9 @@ class LeaveGroupchatsCommand(AdHocCommand):
 
 	@staticmethod
 	def isVisibleFor(samejid):
-		''' Change status is visible only if the entity has the same bare jid. '''
+		"""
+		Change status is visible only if the entity has the same bare jid
+		"""
 		return samejid
 
 	def execute(self, request):
@@ -259,7 +266,9 @@ class ForwardMessagesCommand(AdHocCommand):
 
 	@staticmethod
 	def isVisibleFor(samejid):
-		''' Change status is visible only if the entity has the same bare jid. '''
+		"""
+		Change status is visible only if the entity has the same bare jid
+		"""
 		return samejid
 
 	def execute(self, request):
@@ -282,7 +291,10 @@ class ForwardMessagesCommand(AdHocCommand):
 		return False	# finish the session
 
 class ConnectionCommands:
-	''' This class depends on that it is a part of Connection() class. '''
+	"""
+	This class depends on that it is a part of Connection() class
+	"""
+
 	def __init__(self):
 		# a list of all commands exposed: node -> command class
 		self.__commands = {}
@@ -297,7 +309,9 @@ class ConnectionCommands:
 		return gajim.get_jid_from_account(self.name)
 
 	def isSameJID(self, jid):
-		''' Tests if the bare jid given is the same as our bare jid. '''
+		"""
+		Test if the bare jid given is the same as our bare jid
+		"""
 		return xmpp.JID(jid).getStripped() == self.getOurBareJID()
 
 	def commandListQuery(self, con, iq_obj):
@@ -318,8 +332,10 @@ class ConnectionCommands:
 		self.connection.send(iq)
 
 	def commandInfoQuery(self, con, iq_obj):
-		''' Send disco#info result for query for command (JEP-0050, example 6.).
-		Return True if the result was sent, False if not. '''
+		"""
+		Send disco#info result for query for command (JEP-0050, example 6.).
+		Return True if the result was sent, False if not
+		"""
 		jid = helpers.get_full_jid_from_iq(iq_obj)
 		node = iq_obj.getTagAttr('query', 'node')
 
@@ -342,8 +358,10 @@ class ConnectionCommands:
 		return False
 
 	def commandItemsQuery(self, con, iq_obj):
-		''' Send disco#items result for query for command.
-		Return True if the result was sent, False if not. '''
+		"""
+		Send disco#items result for query for command. Return True if the result
+		was sent, False if not.
+		"""
 		jid = helpers.get_full_jid_from_iq(iq_obj)
 		node = iq_obj.getTagAttr('query', 'node')
 
diff --git a/src/common/config.py b/src/common/config.py
index b73b23c66..a3c59b129 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -225,6 +225,7 @@ class Config:
 		'show_mood_in_roster': [opt_bool, True, '', True],
 		'show_activity_in_roster': [opt_bool, True, '', True],
 		'show_tunes_in_roster': [opt_bool, True, '', True],
+		'show_location_in_roster': [opt_bool, True, '', True],
 		'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True],
 		'ask_avatars_on_startup': [opt_bool, True, _('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.')],
 		'print_status_in_chats': [opt_bool, True, _('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.')],
@@ -272,6 +273,15 @@ class Config:
 		'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!') ],
 		'shell_like_completion': [ opt_bool, False, _('If True, completion in groupchats will be like a shell auto-completion')],
 		'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True],
+		'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'],
+		'audio_output_device': [opt_str, 'autoaudiosink'],
+		'video_input_device': [opt_str, 'autovideosrc ! videoscale ! ffmpegcolorspace'],
+		'video_output_device': [opt_str, 'autovideosink'],
+		'audio_input_volume': [opt_int, 50],
+		'audio_output_volume': [opt_int, 50],
+		'use_stun_server': [opt_bool, True, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')],
+		'stun_server': [opt_str, '', _('STUN server to use when using jingle')],
+		'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')],
 	}
 
 	__options_per_key = {
@@ -344,13 +354,16 @@ class Config:
 			'answer_receipts' : [opt_bool, True, _('Answer to receipt requests')],
 			'request_receipt' : [opt_bool, True, _('Sent receipt requests')],
 			'publish_tune': [opt_bool, False],
+			'publish_location': [opt_bool, False],
 			'subscribe_mood': [opt_bool, True],
 			'subscribe_activity': [opt_bool, True],
 			'subscribe_tune': [opt_bool, True],
 			'subscribe_nick': [opt_bool, True],
+			'subscribe_location': [opt_bool, True],
 			'ignore_unknown_contacts': [ opt_bool, False ],
 			'send_os_info': [ opt_bool, True ],
 			'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')],
+			'send_idle_time': [ opt_bool, True ],
 			'roster_version': [opt_str, ''],
 		}, {}),
 		'statusmsg': ({
@@ -515,7 +528,9 @@ class Config:
 					cb(data, opt3, [opt, opt2], dict_[opt2][opt3])
 
 	def get_children(self, node=None):
-		''' Tree-like interface '''
+		"""
+		Tree-like interface
+		"""
 		if node is None:
 			for child, option in self.__options.iteritems():
 				yield (child, ), option
@@ -701,8 +716,9 @@ class Config:
 		return False
 
 	def should_log(self, account, jid):
-		'''should conversations between a local account and a remote jid be
-		logged?'''
+		"""
+		Should conversations between a local account and a remote jid be logged?
+		"""
 		no_log_for = self.get_per('accounts', account, 'no_log_for')
 
 		if not no_log_for:
diff --git a/src/common/configpaths.py b/src/common/configpaths.py
index ac21e42c6..25c0c8e2d 100644
--- a/src/common/configpaths.py
+++ b/src/common/configpaths.py
@@ -25,6 +25,7 @@
 import os
 import sys
 import tempfile
+import defs
 
 # Note on path and filename encodings:
 #
@@ -46,7 +47,9 @@ import tempfile
 # not displayed to the user, Unicode is not really necessary here.
 
 def fse(s):
-	'''Convert from filesystem encoding if not already Unicode'''
+	"""
+	Convert from filesystem encoding if not already Unicode
+	"""
 	return unicode(s, sys.getfilesystemencoding())
 
 def windowsify(s):
@@ -114,12 +117,9 @@ class ConfigPaths:
 		for n, p in zip(k, v):
 			self.add_from_root(n, p)
 
-		datadir = ''
-		if u'datadir' in os.environ:
-			datadir = fse(os.environ[u'datadir'])
-		if not datadir:
-			datadir = u'..'
-		self.add('DATA', os.path.join(datadir, windowsify(u'data')))
+		basedir = fse(os.environ.get(u'GAJIM_BASEDIR', defs.basedir))
+		self.add('DATA', os.path.join(basedir, windowsify(u'data')))
+		self.add('ICONS', os.path.join(basedir, windowsify(u'icons')))
 		self.add('HOME', fse(os.path.expanduser('~')))
 		try:
 			self.add('TMP', fse(tempfile.gettempdir()))
diff --git a/src/common/connection.py b/src/common/connection.py
index 1e7002d8a..b8b8cc65e 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -98,107 +98,599 @@ ssl_error = {
 32: _("Key usage does not include certificate signing"),
 50: _("Application verification failure")
 }
-class Connection(ConnectionHandlers):
-	'''Connection class'''
+
+class CommonConnection:
+	"""
+	Common connection class, can be derivated for normal connection or zeroconf
+	connection
+	"""
+
 	def __init__(self, name):
-		ConnectionHandlers.__init__(self)
 		self.name = name
 		# self.connected:
 		# 0=>offline,
 		# 1=>connection in progress,
-		# 2=>authorised
+		# 2=>online
+		# 3=>free for chat
+		# ...
 		self.connected = 0
 		self.connection = None # xmpppy ClientCommon instance
-		# this property is used to prevent double connections
-		self.last_connection = None # last ClientCommon instance
-		# If we succeed to connect, remember it so next time we try (after a
-		# disconnection) we try only this type.
-		self.last_connection_type = None
-		self.lang = None
-		if locale.getdefaultlocale()[0]:
-			self.lang = locale.getdefaultlocale()[0].split('_')[0]
+		self.on_purpose = False
 		self.is_zeroconf = False
+		self.password = ''
+		self.server_resource = self._compute_resource()
 		self.gpg = None
 		self.USE_GPG = False
 		if gajim.HAVE_GPG:
 			self.USE_GPG = True
 			self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
 		self.status = ''
-		self.priority = gajim.get_priority(name, 'offline')
 		self.old_show = ''
+		self.priority = gajim.get_priority(name, 'offline')
+		self.time_to_reconnect = None
+		self.bookmarks = []
+
+		self.blocked_list = []
+		self.blocked_contacts = []
+		self.blocked_groups = []
+		self.blocked_all = False
+
+		self.pep_supported = False
+		self.pep = {}
+		# Do we continue connection when we get roster (send presence,get vcard..)
+		self.continue_connect_info = None
+
+		# Remember where we are in the register agent process
+		self.agent_registrations = {}
+		# To know the groupchat jid associated with a sranza ID. Useful to
+		# request vcard or os info... to a real JID but act as if it comes from
+		# the fake jid
+		self.groupchat_jids = {} # {ID : groupchat_jid}
+
+		self.privacy_rules_supported = False
+		self.vcard_supported = False
+		self.private_storage_supported = False
+
+		self.muc_jid = {} # jid of muc server for each transport type
+		self._stun_servers = [] # STUN servers of our jabber server
+
+		self.get_config_values_or_default()
+
+	def _compute_resource(self):
+		resource = gajim.config.get_per('accounts', self.name, 'resource')
+		# All valid resource substitution strings should be added to this hash.
+		if resource:
+			resource = Template(resource).safe_substitute({
+				'hostname': socket.gethostname()
+			})
+		return resource
+
+	def dispatch(self, event, data):
+		"""
+		Always passes account name as first param
+		"""
+		#gajim.interface.dispatch(event, self.name, data)
+		gajim.ged.raise_event(event, self.name, data)
+
+
+	def _reconnect(self):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def quit(self, kill_core):
+		if kill_core and gajim.account_is_connected(self.name):
+			self.disconnect(on_purpose=True)
+
+	def test_gpg_passphrase(self, password):
+		"""
+		Returns 'ok', 'bad_pass' or 'expired'
+		"""
+		if not self.gpg:
+			return False
+		self.gpg.passphrase = password
+		keyID = gajim.config.get_per('accounts', self.name, 'keyid')
+		signed = self.gpg.sign('test', keyID)
+		self.gpg.password = None
+		if signed == 'KEYEXPIRED':
+			return 'expired'
+		elif signed == 'BAD_PASSPHRASE':
+			return 'bad_pass'
+		return 'ok'
+
+	def get_signed_msg(self, msg, callback = None):
+		"""
+		Returns the signed message if possible or an empty string if gpg is not
+		used or None if waiting for passphrase
+
+		callback is the function to call when user give the passphrase
+		"""
+		signed = ''
+		keyID = gajim.config.get_per('accounts', self.name, 'keyid')
+		if keyID and self.USE_GPG:
+			use_gpg_agent = gajim.config.get('use_gpg_agent')
+			if self.gpg.passphrase is None and not use_gpg_agent:
+				# We didn't set a passphrase
+				return None
+			if self.gpg.passphrase is not None or use_gpg_agent:
+				signed = self.gpg.sign(msg, keyID)
+				if signed == 'BAD_PASSPHRASE':
+					self.USE_GPG = False
+					signed = ''
+					self.dispatch('BAD_PASSPHRASE', ())
+		return signed
+
+	def _on_disconnected(self):
+		"""
+		Called when a disconnect request has completed successfully
+		"""
+		self.disconnect(on_purpose=True)
+		self.dispatch('STATUS', 'offline')
+
+	def get_status(self):
+		return gajim.SHOW_LIST[self.connected]
+
+	def check_jid(self, jid):
+		"""
+		This function must be implemented by derivated classes. It has to return
+		the valid jid, or raise a helpers.InvalidFormat exception
+		"""
+		raise NotImplementedError
+
+	def _prepare_message(self, jid, msg, keyID, type_='chat', subject='',
+	chatstate=None, msg_id=None, composing_xep=None, resource=None,
+	user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None,
+	original_message=None, delayed=None, callback=None):
+		if not self.connection or self.connected < 2:
+			return 1
+		try:
+			jid = self.check_jid(jid)
+		except helpers.InvalidFormat:
+			self.dispatch('ERROR', (_('Invalid Jabber ID'),
+				_('It is not possible to send a message to %s, this JID is not '
+				'valid.') % jid))
+			return
+
+		if msg and not xhtml and gajim.config.get(
+		'rst_formatting_outgoing_messages'):
+			from common.rst_xhtml_generator import create_xhtml
+			xhtml = create_xhtml(msg)
+		if not msg and chatstate is None and form_node is None:
+			return
+		fjid = jid
+		if resource:
+			fjid += '/' + resource
+		msgtxt = msg
+		msgenc = ''
+
+		if session:
+			fjid = session.get_to()
+
+		if keyID and self.USE_GPG:
+			xhtml = None
+			if keyID ==  'UNKNOWN':
+				error = _('Neither the remote presence is signed, nor a key was '
+					'assigned.')
+			elif keyID.endswith('MISMATCH'):
+				error = _('The contact\'s key (%s) does not match the key assigned '
+					'in Gajim.' % keyID[:8])
+			else:
+				def encrypt_thread(msg, keyID, always_trust=False):
+					# encrypt message. This function returns (msgenc, error)
+					return self.gpg.encrypt(msg, [keyID], always_trust)
+				def _on_encrypted(output):
+					msgenc, error = output
+					if error == 'NOT_TRUSTED':
+						def _on_always_trust(answer):
+							if answer:
+								gajim.thread_interface(encrypt_thread, [msg, keyID,
+									True], _on_encrypted, [])
+							else:
+								self._message_encrypted_cb(output, type_, msg, msgtxt,
+									original_message, fjid, resource, jid, xhtml,
+									subject, chatstate, composing_xep, forward_from,
+									delayed, session, form_node, user_nick, keyID,
+									callback)
+						self.dispatch('GPG_ALWAYS_TRUST', _on_always_trust)
+					else:
+						self._message_encrypted_cb(output, type_, msg, msgtxt,
+							original_message, fjid, resource, jid, xhtml, subject,
+							chatstate, composing_xep, forward_from, delayed, session,
+							form_node, user_nick, keyID, callback)
+				gajim.thread_interface(encrypt_thread, [msg, keyID, False],
+					_on_encrypted, [])
+				return
+
+			self._message_encrypted_cb(('', error), type_, msg, msgtxt,
+				original_message, fjid, resource, jid, xhtml, subject, chatstate,
+				composing_xep, forward_from, delayed, session, form_node, user_nick,
+				keyID, callback)
+
+		self._on_continue_message(type_, msg, msgtxt, original_message, fjid,
+			resource, jid, xhtml, subject, msgenc, keyID, chatstate, composing_xep,
+			forward_from, delayed, session, form_node, user_nick, callback)
+
+	def _message_encrypted_cb(self, output, type_, msg, msgtxt, original_message,
+	fjid, resource, jid, xhtml, subject, chatstate, composing_xep, forward_from,
+	delayed, session, form_node, user_nick, keyID, callback):
+		msgenc, error = output
+
+		if msgenc and not error:
+			msgtxt = '[This message is *encrypted* (See :XEP:`27`]'
+			lang = os.getenv('LANG')
+			if lang is not None and lang != 'en': # we're not english
+				# one in locale and one en
+				msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \
+					' (' + msgtxt + ')'
+			self._on_continue_message(type_, msg, msgtxt, original_message, fjid,
+				resource, jid, xhtml, subject, msgenc, keyID, chatstate,
+				composing_xep, forward_from, delayed, session, form_node, user_nick,
+				callback)
+			return
+		# Encryption failed, do not send message
+		tim = localtime()
+		self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
+
+	def _on_continue_message(self, type_, msg, msgtxt, original_message, fjid,
+	resource, jid, xhtml, subject, msgenc, keyID, chatstate, composing_xep,
+	forward_from, delayed, session, form_node, user_nick, callback):
+		if type_ == 'chat':
+			msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_,
+				xhtml=xhtml)
+		else:
+			if subject:
+				msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
+					subject=subject, xhtml=xhtml)
+			else:
+				msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
+					xhtml=xhtml)
+		if msgenc:
+			msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc)
+
+		if form_node:
+			msg_iq.addChild(node=form_node)
+
+		# XEP-0172: user_nickname
+		if user_nick:
+			msg_iq.setTag('nick', namespace = common.xmpp.NS_NICK).setData(
+				user_nick)
+
+		# TODO: We might want to write a function so we don't need to
+		#	reproduce that ugly if somewhere else.
+		if resource:
+			contact = gajim.contacts.get_contact(self.name, jid, resource)
+		else:
+			contact = gajim.contacts.get_contact_with_highest_priority(self.name,
+				jid)
+
+		# chatstates - if peer supports xep85 or xep22, send chatstates
+		# please note that the only valid tag inside a message containing a <body>
+		# tag is the active event
+		if chatstate is not None and contact:
+			if ((composing_xep == 'XEP-0085' or not composing_xep) \
+			and composing_xep != 'asked_once') or \
+			contact.supports(common.xmpp.NS_CHATSTATES):
+				# XEP-0085
+				msg_iq.setTag(chatstate, namespace=common.xmpp.NS_CHATSTATES)
+			if composing_xep in ('XEP-0022', 'asked_once') or \
+			not composing_xep:
+				# XEP-0022
+				chatstate_node = msg_iq.setTag('x', namespace=common.xmpp.NS_EVENT)
+				if chatstate is 'composing' or msgtxt:
+					chatstate_node.addChild(name='composing')
+
+		if forward_from:
+			addresses = msg_iq.addChild('addresses',
+				namespace=common.xmpp.NS_ADDRESS)
+			addresses.addChild('address', attrs = {'type': 'ofrom',
+				'jid': forward_from})
+
+		# XEP-0203
+		if delayed:
+			our_jid = gajim.get_jid_from_account(self.name) + '/' + \
+				self.server_resource
+			timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(delayed))
+			msg_iq.addChild('delay', namespace=common.xmpp.NS_DELAY2,
+				attrs={'from': our_jid, 'stamp': timestamp})
+
+		# XEP-0184
+		if msgtxt and gajim.config.get_per('accounts', self.name,
+		'request_receipt') and contact and contact.supports(
+		common.xmpp.NS_RECEIPTS):
+			msg_iq.setTag('request', namespace=common.xmpp.NS_RECEIPTS)
+
+		if session:
+			# XEP-0201
+			session.last_send = time.time()
+			msg_iq.setThread(session.thread_id)
+
+			# XEP-0200
+			if session.enable_encryption:
+				msg_iq = session.encrypt_stanza(msg_iq)
+
+		if callback:
+			callback(jid, msg, keyID, forward_from, session, original_message,
+				subject, type_, msg_iq)
+
+	def log_message(self, jid, msg, forward_from, session, original_message,
+	subject, type_):
+		if not forward_from and session and session.is_loggable():
+			ji = gajim.get_jid_without_resource(jid)
+			if gajim.config.should_log(self.name, ji):
+				log_msg = msg
+				if original_message is not None:
+					log_msg = original_message
+				if subject:
+					log_msg = _('Subject: %(subject)s\n%(message)s') % \
+					{'subject': subject, 'message': log_msg}
+				if log_msg:
+					if type_ == 'chat':
+						kind = 'chat_msg_sent'
+					else:
+						kind = 'single_msg_sent'
+					try:
+						gajim.logger.write(kind, jid, log_msg)
+					except exceptions.PysqliteOperationalError, e:
+						self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
+					except exceptions.DatabaseMalformed:
+						pritext = _('Database Error')
+						sectext = _('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).') % \
+							common.logger.LOG_DB_PATH
+
+	def ack_subscribed(self, jid):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def ack_unsubscribed(self, jid):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def request_subscription(self, jid, msg='', name='', groups=[],
+			auto_auth=False):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def send_authorization(self, jid):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def refuse_authorization(self, jid):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def unsubscribe(self, jid, remove_auth = True):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def unsubscribe_agent(self, agent):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def update_contact(self, jid, name, groups):
+		if self.connection:
+			self.connection.getRoster().setItem(jid=jid, name=name, groups=groups)
+
+	def update_contacts(self, contacts):
+		"""
+		Update multiple roster items
+		"""
+		if self.connection:
+			self.connection.getRoster().setItemMulti(contacts)
+
+	def new_account(self, name, config, sync=False):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def _on_new_account(self, con=None, con_type=None):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def account_changed(self, new_name):
+		self.name = new_name
+
+	def request_last_status_time(self, jid, resource):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def request_os_info(self, jid, resource):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def get_settings(self):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def get_bookmarks(self):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def store_bookmarks(self):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def get_metacontacts(self):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def send_agent_status(self, agent, ptype):
+		"""
+		To be implemented by derivated classes
+		"""
+		raise NotImplementedError
+
+	def gpg_passphrase(self, passphrase):
+		if self.gpg:
+			use_gpg_agent = gajim.config.get('use_gpg_agent')
+			if use_gpg_agent:
+				self.gpg.passphrase = None
+			else:
+				self.gpg.passphrase = passphrase
+
+	def ask_gpg_keys(self):
+		if self.gpg:
+			keys = self.gpg.get_keys()
+			return keys
+		return None
+
+	def ask_gpg_secrete_keys(self):
+		if self.gpg:
+			keys = self.gpg.get_secret_keys()
+			return keys
+		return None
+
+	def load_roster_from_db(self):
+		# Do nothing by default
+		return
+
+	def _event_dispatcher(self, realm, event, data):
+		if realm == '':
+			if event == common.xmpp.transports_nb.DATA_RECEIVED:
+				self.dispatch('STANZA_ARRIVED', unicode(data, errors='ignore'))
+			elif event == common.xmpp.transports_nb.DATA_SENT:
+				self.dispatch('STANZA_SENT', unicode(data))
+
+	def change_status(self, show, msg, auto=False):
+		if not msg:
+			msg = ''
+		sign_msg = False
+		if not auto and not show == 'offline':
+			sign_msg = True
+		if show != 'invisible':
+			# We save it only when privacy list is accepted
+			self.status = msg
+		if show != 'offline' and self.connected < 1:
+			# set old_show to requested 'show' in case we need to
+			# recconect before we auth to server
+			self.old_show = show
+			self.on_purpose = False
+			self.server_resource = self._compute_resource()
+			if gajim.HAVE_GPG:
+				self.USE_GPG = True
+				self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
+			self.connect_and_init(show, msg, sign_msg)
+			return
+
+		if show == 'offline':
+			self.connected = 0
+			if self.connection:
+				p = common.xmpp.Presence(typ = 'unavailable')
+				p = self.add_sha(p, False)
+				if msg:
+					p.setStatus(msg)
+
+				self.connection.RegisterDisconnectHandler(self._on_disconnected)
+				self.connection.send(p, now=True)
+				self.connection.start_disconnect()
+			else:
+				self._on_disconnected()
+			return
+
+		if show != 'offline' and self.connected > 0:
+			# dont'try to connect, when we are in state 'connecting'
+			if self.connected == 1:
+				return
+			if show == 'invisible':
+				self._change_to_invisible(msg)
+				return
+			if show not in ['offline', 'online', 'chat', 'away', 'xa', 'dnd']:
+				return -1
+			was_invisible = self.connected == gajim.SHOW_LIST.index('invisible')
+			self.connected = gajim.SHOW_LIST.index(show)
+			if was_invisible:
+				self._change_from_invisible()
+			self._update_status(show, msg)
+
+class Connection(CommonConnection, ConnectionHandlers):
+	def __init__(self, name):
+		CommonConnection.__init__(self, name)
+		ConnectionHandlers.__init__(self)
+		# this property is used to prevent double connections
+		self.last_connection = None # last ClientCommon instance
+		# If we succeed to connect, remember it so next time we try (after a
+		# disconnection) we try only this type.
+		self.last_connection_type = None
+		self.lang = None
+		if locale.getdefaultlocale()[0]:
+			self.lang = locale.getdefaultlocale()[0].split('_')[0]
 		# increase/decrease default timeout for server responses
 		self.try_connecting_for_foo_secs = 45
 		# holds the actual hostname to which we are connected
 		self.connected_hostname = None
-		self.time_to_reconnect = None
 		self.last_time_to_reconnect = None
 		self.new_account_info = None
 		self.new_account_form = None
-		self.bookmarks = []
 		self.annotations = {}
-		self.on_purpose = False
 		self.last_io = gajim.idlequeue.current_time()
 		self.last_sent = []
 		self.last_history_time = {}
 		self.password = passwords.get_password(name)
-		self.server_resource = gajim.config.get_per('accounts', name, 'resource')
-		# All valid resource substitution strings should be added to this hash.
-		if self.server_resource:
-			self.server_resource = Template(self.server_resource).safe_substitute({
-				'hostname': socket.gethostname()
-			})
-		if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'):
-			self.keepalives = gajim.config.get_per('accounts', self.name,
-				'keep_alive_every_foo_secs')
-		else:
-			self.keepalives = 0
-		if gajim.config.get_per('accounts', self.name, 'ping_alives_enabled'):
-			self.pingalives = gajim.config.get_per('accounts', self.name,
-				'ping_alive_every_foo_secs')
-		else:
-			self.pingalives = 0
-		self.privacy_rules_supported = False
-		# Used to ask privacy only once at connection
-		self.privacy_rules_requested = False
-		self.blocked_list = []
-		self.blocked_contacts = []
-		self.blocked_groups = []
-		self.blocked_all = False
+
 		self.music_track_info = 0
+		self.location_info = {}
 		self.pubsub_supported = False
 		self.pubsub_publish_options_supported = False
-		self.pep_supported = False
-		self.mood = {}
-		self.tune = {}
-		self.activity = {}
-		# Do we continue connection when we get roster (send presence,get vcard..)
-		self.continue_connect_info = None
 		# Do we auto accept insecure connection
 		self.connection_auto_accepted = False
-		# To know the groupchat jid associated with a sranza ID. Useful to
-		# request vcard or os info... to a real JID but act as if it comes from
-		# the fake jid
-		self.groupchat_jids = {} # {ID : groupchat_jid}
 		self.pasword_callback = None
 
 		self.on_connect_success = None
 		self.on_connect_failure = None
 		self.retrycount = 0
 		self.jids_for_auto_auth = [] # list of jid to auto-authorize
-		self.muc_jid = {} # jid of muc server for each transport type
 		self.available_transports = {} # list of available transports on this
 		# server {'icq': ['icq.server.com', 'icq2.server.com'], }
-		self.vcard_supported = False
 		self.private_storage_supported = True
 		self.streamError = ''
 		self.secret_hmac = str(random.random())[2:]
 	# END __init__
 
-	def dispatch(self, event, data):
-		'''always passes account name as first param'''
-		#gajim.interface.dispatch(event, self.name, data)
-		gajim.ged.raise_event(event, self.name, data)
+	def get_config_values_or_default(self):
+		if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'):
+			self.keepalives = gajim.config.get_per('accounts', self.name,
+				'keep_alive_every_foo_secs')
+		else:
+			self.keepalives = 0
+		if gajim.config.get_per('accounts', self.name, 'ping_alives_enabled'):
+			self.pingalives = gajim.config.get_per('accounts', self.name,
+				'ping_alive_every_foo_secs')
+		else:
+			self.pingalives = 0
 
+	def check_jid(self, jid):
+		return helpers.parse_jid(jid)
 
 	def _reconnect(self):
 		# Do not try to reco while we are already trying
@@ -225,12 +717,16 @@ class Connection(ConnectionHandlers):
 		if self.connection:
 			# make sure previous connection is completely closed
 			gajim.proxy65_manager.disconnect(self.connection)
+			self.terminate_sessions()
+			self.remove_all_transfers()
 			self.connection.disconnect()
 			self.last_connection = None
 			self.connection = None
 
 	def _disconnectedReconnCB(self):
-		'''Called when we are disconnected'''
+		"""
+		Called when we are disconnected
+		"""
 		log.info('disconnectedReconnCB called')
 		if gajim.account_is_connected(self.name):
 			# we cannot change our status to offline or connecting
@@ -280,6 +776,7 @@ class Connection(ConnectionHandlers):
 			_('Reconnect manually.')))
 
 	def _event_dispatcher(self, realm, event, data):
+		CommonConnection._event_dispatcher(self, realm, event, data)
 		if realm == common.xmpp.NS_REGISTER:
 			if event == common.xmpp.features_nb.REGISTER_DATA_RECEIVED:
 				# data is (agent, DataFrom, is_form, error_msg)
@@ -385,18 +882,13 @@ class Connection(ConnectionHandlers):
 			elif event == common.xmpp.features_nb.PRIVACY_LISTS_ACTIVE_DEFAULT:
 				# data is (dict)
 				self.dispatch('PRIVACY_LISTS_ACTIVE_DEFAULT', (data))
-		elif realm == '':
-			if event == common.xmpp.transports_nb.DATA_RECEIVED:
-				self.dispatch('STANZA_ARRIVED', unicode(data, errors = 'ignore'))
-			elif event == common.xmpp.transports_nb.DATA_SENT:
-				self.dispatch('STANZA_SENT', unicode(data))
 
 	def _select_next_host(self, hosts):
-		'''Selects the next host according to RFC2782 p.3 based on it's
-		priority. Chooses between hosts with the same priority randomly,
-		where the probability of being selected is proportional to the weight
-		of the host.'''
-
+		"""
+		Selects the next host according to RFC2782 p.3 based on it's priority.
+		Chooses between hosts with the same priority randomly, where the
+		probability of being selected is proportional to the weight of the host
+		"""
 		hosts_by_prio = sorted(hosts, key=operator.itemgetter('prio'))
 
 		try:
@@ -418,10 +910,13 @@ class Connection(ConnectionHandlers):
 					return host
 
 	def connect(self, data = None):
-		''' Start a connection to the Jabber server.
-		Returns connection, and connection type ('tls', 'ssl', 'plain', '')
-		data MUST contain hostname, usessl, proxy, use_custom_host,
-		custom_host (if use_custom_host), custom_port (if use_custom_host)'''
+		"""
+		Start a connection to the Jabber server
+
+		Returns connection, and connection type ('tls', 'ssl', 'plain', '') data
+		MUST contain hostname, usessl, proxy, use_custom_host, custom_host (if
+		use_custom_host), custom_port (if use_custom_host)
+		"""
 		if self.connection:
 			return self.connection, ''
 
@@ -803,10 +1298,6 @@ class Connection(ConnectionHandlers):
 				self.on_connect_auth = None
 	# END connect
 
-	def quit(self, kill_core):
-		if kill_core and gajim.account_is_connected(self.name):
-			self.disconnect(on_purpose=True)
-
 	def add_lang(self, stanza):
 		if self.lang:
 			stanza.setAttr('xml:lang', self.lang)
@@ -821,9 +1312,16 @@ class Connection(ConnectionHandlers):
 		if self.connection:
 			self.connection.send(' ')
 
+	def _on_xmpp_ping_answer(self, iq_obj):
+		id_ = unicode(iq_obj.getAttr('id'))
+		assert id_ == self.awaiting_xmpp_ping_id
+		self.awaiting_xmpp_ping_id = None
+
 	def sendPing(self, pingTo=None):
-		'''Send XMPP Ping (XEP-0199) request. If pingTo is not set, ping is sent
-		to server to detect connection failure at application level.'''
+		"""
+		Send XMPP Ping (XEP-0199) request. If pingTo is not set, ping is sent to
+		server to detect connection failure at application level
+		"""
 		if not self.connection:
 			return
 		id_ = self.connection.getAnID()
@@ -847,7 +1345,7 @@ class Connection(ConnectionHandlers):
 			timePing = time_time()
 			self.connection.SendAndCallForResponse(iq, _on_response)
 		else:
-			self.connection.send(iq)
+			self.connection.SendAndCallForResponse(iq, self._on_xmpp_ping_answer)
 			gajim.idlequeue.set_alarm(self.check_pingalive, gajim.config.get_per(
 				'accounts', self.name, 'time_for_ping_alive_answer'))
 
@@ -891,7 +1389,9 @@ class Connection(ConnectionHandlers):
 		common.xmpp.features_nb.setDefaultPrivacyList(self.connection, listname)
 
 	def build_privacy_rule(self, name, action, order=1):
-		'''Build a Privacy rule stanza for invisibility'''
+		"""
+		Build a Privacy rule stanza for invisibility
+		"""
 		iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '')
 		l = iq.getTag('query').setTag('list', {'name': name})
 		i = l.setTag('item', {'action': action, 'order': str(order)})
@@ -924,7 +1424,9 @@ class Connection(ConnectionHandlers):
 		self.connection.send(iq)
 
 	def activate_privacy_rule(self, name):
-		'''activate a privacy rule'''
+		"""
+		Activate a privacy rule
+		"""
 		if not self.connection:
 			return
 		iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '')
@@ -986,45 +1488,11 @@ class Connection(ConnectionHandlers):
 			#Inform GUI we just signed in
 			self.dispatch('SIGNED_IN', ())
 
-	def test_gpg_passphrase(self, password):
-		'''Returns 'ok', 'bad_pass' or 'expired' '''
-		if not self.gpg:
-			return False
-		self.gpg.passphrase = password
-		keyID = gajim.config.get_per('accounts', self.name, 'keyid')
-		signed = self.gpg.sign('test', keyID)
-		self.gpg.password = None
-		if signed == 'KEYEXPIRED':
-			return 'expired'
-		elif signed == 'BAD_PASSPHRASE':
-			return 'bad_pass'
-		return 'ok'
-
 	def get_signed_presence(self, msg, callback = None):
 		if gajim.config.get_per('accounts', self.name, 'gpg_sign_presence'):
 			return self.get_signed_msg(msg, callback)
 		return ''
 
-	def get_signed_msg(self, msg, callback = None):
-		'''returns the signed message if possible
-		or an empty string if gpg is not used
-		or None if waiting for passphrase.
-		callback is the function to call when user give the passphrase'''
-		signed = ''
-		keyID = gajim.config.get_per('accounts', self.name, 'keyid')
-		if keyID and self.USE_GPG:
-			use_gpg_agent = gajim.config.get('use_gpg_agent')
-			if self.gpg.passphrase is None and not use_gpg_agent:
-				# We didn't set a passphrase
-				return None
-			if self.gpg.passphrase is not None or use_gpg_agent:
-				signed = self.gpg.sign(msg, keyID)
-				if signed == 'BAD_PASSPHRASE':
-					self.USE_GPG = False
-					signed = ''
-					self.dispatch('BAD_PASSPHRASE', ())
-		return signed
-
 	def connect_and_auth(self):
 		self.on_connect_success = self._connect_success
 		self.on_connect_failure = self._connect_failure
@@ -1045,6 +1513,13 @@ class Connection(ConnectionHandlers):
 		self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'),
 			id_prefix='Gajim_')
 		self.privacy_rules_requested = False
+		# Discover Stun server(s)
+		gajim.resolver.resolve('_stun._udp.' + helpers.idn_to_ascii(
+			self.connected_hostname), self._on_stun_resolved)
+
+	def _on_stun_resolved(self, host, result_array):
+		if len(result_array) != 0:
+			self._stun_servers = self._hosts = [i for i in result_array]
 
 	def _request_privacy(self):
 		iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '')
@@ -1078,92 +1553,30 @@ class Connection(ConnectionHandlers):
 				p.setTag(common.xmpp.NS_SIGNED + ' x').setData(signed)
 		self.connection.send(p)
 
-	def change_status(self, show, msg, auto = False):
-		if not show in gajim.SHOW_LIST:
-			return -1
-		sshow = helpers.get_xmpp_show(show)
-		if not msg:
-			msg = ''
-		sign_msg = False
-		if not auto and not show == 'offline':
-			sign_msg = True
-		if show != 'invisible':
-			# We save it only when privacy list is accepted
-			self.status = msg
-		if show != 'offline' and self.connected < 1:
-			# set old_show to requested 'show' in case we need to
-			# recconect before we auth to server
-			self.old_show = show
-			self.on_purpose = False
-			self.server_resource = gajim.config.get_per('accounts', self.name,
-				'resource')
-			# All valid resource substitution strings should be added to this hash.
-			if self.server_resource:
-				self.server_resource = Template(self.server_resource).\
-					safe_substitute({
-						'hostname': socket.gethostname()
-					})
-			if gajim.HAVE_GPG:
-				self.USE_GPG = True
-				self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
-			self.connect_and_init(show, msg, sign_msg)
+	def _change_to_invisible(self, msg):
+		signed = self.get_signed_presence(msg)
+		self.send_invisible_presence(msg, signed)
 
-		elif show == 'offline':
-			self.connected = 0
-			if self.connection:
-				self.terminate_sessions()
-
-				self.on_purpose = True
-				p = common.xmpp.Presence(typ = 'unavailable')
-				p = self.add_sha(p, False)
-				if msg:
-					p.setStatus(msg)
-				self.remove_all_transfers()
-				self.time_to_reconnect = None
-
-				self.connection.RegisterDisconnectHandler(self._on_disconnected)
-				self.connection.send(p, now=True)
-				self.connection.start_disconnect()
-				#self.connection.start_disconnect(p, self._on_disconnected)
-			else:
-				self.time_to_reconnect = None
-				self._on_disconnected()
-
-		elif show != 'offline' and self.connected > 0:
-			# dont'try to connect, when we are in state 'connecting'
-			if self.connected == 1:
-				return
-			if show == 'invisible':
-				signed = self.get_signed_presence(msg)
-				self.send_invisible_presence(msg, signed)
-				return
-			was_invisible = self.connected == gajim.SHOW_LIST.index('invisible')
-			self.connected = gajim.SHOW_LIST.index(show)
-			if was_invisible and self.privacy_rules_supported:
-				iq = self.build_privacy_rule('visible', 'allow')
-				self.connection.send(iq)
-				self.activate_privacy_rule('visible')
-			priority = unicode(gajim.get_priority(self.name, sshow))
-			p = common.xmpp.Presence(typ = None, priority = priority, show = sshow)
-			p = self.add_sha(p)
-			if msg:
-				p.setStatus(msg)
-			signed = self.get_signed_presence(msg)
-			if signed:
-				p.setTag(common.xmpp.NS_SIGNED + ' x').setData(signed)
-			if self.connection:
-				self.connection.send(p)
-				self.priority = priority
-			self.dispatch('STATUS', show)
-
-	def _on_disconnected(self):
-		''' called when a disconnect request has completed successfully'''
-		self.disconnect(on_purpose=True)
-		self.dispatch('STATUS', 'offline')
-
-	def get_status(self):
-		return gajim.SHOW_LIST[self.connected]
+	def _change_from_invisible(self):
+		if self.privacy_rules_supported:
+			iq = self.build_privacy_rule('visible', 'allow')
+			self.connection.send(iq)
+			self.activate_privacy_rule('visible')
 
+	def _update_status(self, show, msg):
+		xmpp_show = helpers.get_xmpp_show(show)
+		priority = unicode(gajim.get_priority(self.name, xmpp_show))
+		p = common.xmpp.Presence(typ=None, priority=priority, show=xmpp_show)
+		p = self.add_sha(p)
+		if msg:
+			p.setStatus(msg)
+		signed = self.get_signed_presence(msg)
+		if signed:
+			p.setTag(common.xmpp.NS_SIGNED + ' x').setData(signed)
+		if self.connection:
+			self.connection.send(p)
+			self.priority = priority
+		self.dispatch('STATUS', show)
 
 	def send_motd(self, jid, subject = '', msg = '', xhtml = None):
 		if not self.connection:
@@ -1177,205 +1590,28 @@ class Connection(ConnectionHandlers):
 	chatstate=None, msg_id=None, composing_xep=None, resource=None,
 	user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None,
 	original_message=None, delayed=None, callback=None, callback_args=[]):
-		if not self.connection or self.connected < 2:
-			return 1
-		try:
-			jid = helpers.parse_jid(jid)
-		except helpers.InvalidFormat:
-			self.dispatch('ERROR', (_('Invalid Jabber ID'),
-				_('It is not possible to send a message to %s, this JID is not '
-				'valid.') % jid))
-			return
-
-		if msg and not xhtml and gajim.config.get(
-		'rst_formatting_outgoing_messages'):
-			from common.rst_xhtml_generator import create_xhtml
-			xhtml = create_xhtml(msg)
-		if not msg and chatstate is None and form_node is None:
-			return
-		fjid = jid
-		if resource:
-			fjid += '/' + resource
-		msgtxt = msg
-		msgenc = ''
-
-		if session:
-			fjid = session.get_to()
-
-		if keyID and self.USE_GPG:
-			xhtml = None
-			if keyID ==  'UNKNOWN':
-				error = _('Neither the remote presence is signed, nor a key was assigned.')
-			elif keyID.endswith('MISMATCH'):
-				error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8])
-			else:
-				def encrypt_thread(msg, keyID, always_trust=False):
-					# encrypt message. This function returns (msgenc, error)
-					return self.gpg.encrypt(msg, [keyID], always_trust)
-				def _on_encrypted(output):
-					msgenc, error = output
-					if error == 'NOT_TRUSTED':
-						def _on_always_trust(answer):
-							if answer:
-								gajim.thread_interface(encrypt_thread, [msg, keyID,
-									True], _on_encrypted, [])
-							else:
-								self._on_message_encrypted(output, type_, msg, msgtxt,
-									original_message, fjid, resource, jid, xhtml,
-									subject, chatstate, composing_xep, forward_from,
-									delayed, session, form_node, user_nick, keyID,
-									callback, callback_args)
-						self.dispatch('GPG_ALWAYS_TRUST', _on_always_trust)
-					else:
-						self._on_message_encrypted(output, type_, msg, msgtxt,
-							original_message, fjid, resource, jid, xhtml, subject,
-							chatstate, composing_xep, forward_from, delayed, session,
-							form_node, user_nick, keyID, callback, callback_args)
-				gajim.thread_interface(encrypt_thread, [msg, keyID, False],
-					_on_encrypted, [])
-				return
-
-			self._on_message_encrypted(('', error), type_, msg, msgtxt,
-				original_message, fjid, resource, jid, xhtml, subject, chatstate,
-				composing_xep, forward_from, delayed, session, form_node, user_nick,
-				keyID, callback, callback_args)
-
-		self._on_continue_message(type_, msg, msgtxt, original_message, fjid,
-			resource, jid, xhtml, subject, msgenc, keyID, chatstate, composing_xep,
-			forward_from, delayed, session, form_node, user_nick, callback,
-			callback_args)
-
-	def _on_message_encrypted(self, output, type_, msg, msgtxt, original_message,
-	fjid, resource, jid, xhtml, subject, chatstate, composing_xep, forward_from,
-	delayed, session, form_node, user_nick, keyID, callback, callback_args):
-		msgenc, error = output
-
-		if msgenc and not error:
-			msgtxt = '[This message is *encrypted* (See :XEP:`27`]'
-			lang = os.getenv('LANG')
-			if lang is not None and lang != 'en': # we're not english
-				# one in locale and one en
-				msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \
-					' (' + msgtxt + ')'
-			self._on_continue_message(type_, msg, msgtxt, original_message, fjid,
-				resource, jid, xhtml, subject, msgenc, keyID, chatstate,
-				composing_xep, forward_from, delayed, session, form_node, user_nick,
-				callback, callback_args)
-			return
-		# Encryption failed, do not send message
-		tim = localtime()
-		self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
-
-	def _on_continue_message(self, type_, msg, msgtxt, original_message, fjid,
-	resource, jid, xhtml, subject, msgenc, keyID, chatstate, composing_xep,
-	forward_from, delayed, session, form_node, user_nick, callback,
-	callback_args):
-		if type_ == 'chat':
-			msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_,
-				xhtml=xhtml)
-		else:
-			if subject:
-				msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
-					subject=subject, xhtml=xhtml)
-			else:
-				msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
-					xhtml=xhtml)
-		if msgenc:
-			msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc)
-
-		if form_node:
-			msg_iq.addChild(node=form_node)
-
-		# XEP-0172: user_nickname
-		if user_nick:
-			msg_iq.setTag('nick', namespace = common.xmpp.NS_NICK).setData(
-				user_nick)
-
-		# TODO: We might want to write a function so we don't need to
-		#	reproduce that ugly if somewhere else.
-		if resource:
-			contact = gajim.contacts.get_contact(self.name, jid, resource)
-		else:
-			contact = gajim.contacts.get_contact_with_highest_priority(self.name,
-				jid)
-
-		# chatstates - if peer supports xep85 or xep22, send chatstates
-		# please note that the only valid tag inside a message containing a <body>
-		# tag is the active event
-		if chatstate is not None and contact:
-			if ((composing_xep == 'XEP-0085' or not composing_xep) \
-			and composing_xep != 'asked_once') or \
-			contact.supports(common.xmpp.NS_CHATSTATES):
-				# XEP-0085
-				msg_iq.setTag(chatstate, namespace=common.xmpp.NS_CHATSTATES)
-			if composing_xep in ('XEP-0022', 'asked_once') or \
-			not composing_xep:
-				# XEP-0022
-				chatstate_node = msg_iq.setTag('x', namespace=common.xmpp.NS_EVENT)
-				if chatstate is 'composing' or msgtxt:
-					chatstate_node.addChild(name='composing')
-
-		if forward_from:
-			addresses = msg_iq.addChild('addresses',
-				namespace=common.xmpp.NS_ADDRESS)
-			addresses.addChild('address', attrs = {'type': 'ofrom',
-				'jid': forward_from})
-
-		# XEP-0203
-		if delayed:
-			our_jid = gajim.get_jid_from_account(self.name) + '/' + \
-				self.server_resource
-			timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(delayed))
-			msg_iq.addChild('delay', namespace=common.xmpp.NS_DELAY2,
-				attrs={'from': our_jid, 'stamp': timestamp})
 
-		# XEP-0184
-		if msgtxt and gajim.config.get_per('accounts', self.name,
-		'request_receipt') and contact and contact.supports(
-		common.xmpp.NS_RECEIPTS):
-			msg_iq.setTag('request', namespace=common.xmpp.NS_RECEIPTS)
+		def cb(jid, msg, keyID, forward_from, session, original_message, subject,
+		type_, msg_iq):
+			msg_id = self.connection.send(msg_iq)
+			jid = helpers.parse_jid(jid)
+			self.dispatch('MSGSENT', (jid, msg, keyID))
+			if callback:
+				callback(msg_id, *callback_args)
 
-		if session:
-			# XEP-0201
-			session.last_send = time.time()
-			msg_iq.setThread(session.thread_id)
+			self.log_message(jid, msg, forward_from, session, original_message,
+				subject, type_)
 
-			# XEP-0200
-			if session.enable_encryption:
-				msg_iq = session.encrypt_stanza(msg_iq)
-
-		msg_id = self.connection.send(msg_iq)
-		if not forward_from and session and session.is_loggable():
-			ji = gajim.get_jid_without_resource(jid)
-			if gajim.config.should_log(self.name, ji):
-				log_msg = msg
-				if original_message is not None:
-					log_msg = original_message
-				if subject:
-					log_msg = _('Subject: %(subject)s\n%(message)s') % \
-					{'subject': subject, 'message': msg}
-				if log_msg:
-					if type_ == 'chat':
-						kind = 'chat_msg_sent'
-					else:
-						kind = 'single_msg_sent'
-					try:
-						gajim.logger.write(kind, jid, log_msg)
-					except exceptions.PysqliteOperationalError, e:
-						self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
-					except exceptions.DatabaseMalformed:
-						pritext = _('Database Error')
-						sectext = _('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).') % \
-							common.logger.LOG_DB_PATH
-		self.dispatch('MSGSENT', (jid, msg, keyID))
-
-		if callback:
-			callback(msg_id, *callback_args)
+		self._prepare_message(jid, msg, keyID, type_=type_, subject=subject,
+			chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep,
+			resource=resource, user_nick=user_nick, xhtml=xhtml, session=session,
+			forward_from=forward_from, form_node=form_node,
+			original_message=original_message, delayed=delayed, callback=cb)
 
 	def send_contacts(self, contacts, jid):
-		'''Send contacts with RosterX (Xep-0144)'''
+		"""
+		Send contacts with RosterX (Xep-0144)
+		"""
 		if not self.connection:
 			return
 		if len(contacts) == 1:
@@ -1394,7 +1630,9 @@ class Connection(ConnectionHandlers):
 		self.connection.send(msg_iq)
 
 	def send_stanza(self, stanza):
-		''' send a stanza untouched '''
+		"""
+		Send a stanza untouched
+		"""
 		if not self.connection:
 			return
 		self.connection.send(stanza)
@@ -1413,8 +1651,8 @@ class Connection(ConnectionHandlers):
 		p = common.xmpp.Presence(jid, 'unsubscribe')
 		self.connection.send(p)
 
-	def request_subscription(self, jid, msg = '', name = '', groups = [],
-	auto_auth = False, user_nick = ''):
+	def request_subscription(self, jid, msg='', name='', groups=[],
+	auto_auth=False, user_nick=''):
 		if not self.connection:
 			return
 		log.debug('subscription request for %s' % jid)
@@ -1426,7 +1664,7 @@ class Connection(ConnectionHandlers):
 			infos['name'] = name
 		iq = common.xmpp.Iq('set', common.xmpp.NS_ROSTER)
 		q = iq.getTag('query')
-		item = q.addChild('item', attrs = infos)
+		item = q.addChild('item', attrs=infos)
 		for g in groups:
 			item.addChild('group').setData(g)
 		self.connection.send(iq)
@@ -1477,17 +1715,6 @@ class Connection(ConnectionHandlers):
 		self.connection.send(iq)
 		self.connection.getRoster().delItem(agent)
 
-	def update_contact(self, jid, name, groups):
-		'''update roster item on jabber server'''
-		if self.connection:
-			self.connection.getRoster().setItem(jid = jid, name = name,
-				groups = groups)
-
-	def update_contacts(self, contacts):
-		'''update multiple roster items on jabber server'''
-		if self.connection:
-			self.connection.getRoster().setItemMulti(contacts)
-
 	def send_new_account_infos(self, form, is_form):
 		if is_form:
 			# Get username and password and put them in new_account_info
@@ -1505,7 +1732,7 @@ class Connection(ConnectionHandlers):
 		self.new_account_form = form
 		self.new_account(self.name, self.new_account_info)
 
-	def new_account(self, name, config, sync = False):
+	def new_account(self, name, config, sync=False):
 		# If a connection already exist we cannot create a new account
 		if self.connection:
 			return
@@ -1516,7 +1743,7 @@ class Connection(ConnectionHandlers):
 		self.on_connect_failure = self._on_new_account
 		self.connect(config)
 
-	def _on_new_account(self, con = None, con_type = None):
+	def _on_new_account(self, con=None, con_type=None):
 		if not con_type:
 			if len(self._connection_types) or len(self._hosts):
 				# There are still other way to try to connect
@@ -1528,12 +1755,11 @@ class Connection(ConnectionHandlers):
 		self.connection = con
 		common.xmpp.features_nb.getRegInfo(con, self._hostname)
 
-	def account_changed(self, new_name):
-		self.name = new_name
-
 	def request_last_status_time(self, jid, resource, groupchat_jid=None):
-		'''groupchat_jid is used when we want to send a request to a real jid
-		and act as if the answer comes from the groupchat_jid'''
+		"""
+		groupchat_jid is used when we want to send a request to a real jid and
+		act as if the answer comes from the groupchat_jid
+		"""
 		if not self.connection:
 			return
 		to_whom_jid = jid
@@ -1549,8 +1775,10 @@ class Connection(ConnectionHandlers):
 		self.connection.send(iq)
 
 	def request_os_info(self, jid, resource, groupchat_jid=None):
-		'''groupchat_jid is used when we want to send a request to a real jid
-		and act as if the answer comes from the groupchat_jid'''
+		"""
+		groupchat_jid is used when we want to send a request to a real jid and
+		act as if the answer comes from the groupchat_jid
+		"""
 		if not self.connection:
 			return
 		# If we are invisible, do not request
@@ -1570,8 +1798,10 @@ class Connection(ConnectionHandlers):
 		self.connection.send(iq)
 
 	def request_entity_time(self, jid, resource, groupchat_jid=None):
-		'''groupchat_jid is used when we want to send a request to a real jid
-		and act as if the answer comes from the groupchat_jid'''
+		"""
+		groupchat_jid is used when we want to send a request to a real jid and
+		act as if the answer comes from the groupchat_jid
+		"""
 		if not self.connection:
 			return
 		# If we are invisible, do not request
@@ -1591,7 +1821,9 @@ class Connection(ConnectionHandlers):
 		self.connection.send(iq)
 
 	def get_settings(self):
-		''' Get Gajim settings as described in XEP 0049 '''
+		"""
+		Get Gajim settings as described in XEP 0049
+		"""
 		if not self.connection:
 			return
 		iq = common.xmpp.Iq(typ='get')
@@ -1612,9 +1844,12 @@ class Connection(ConnectionHandlers):
 			self._request_bookmarks_xml()
 
 	def get_bookmarks(self, storage_type=None):
-		'''Get Bookmarks from storage or PubSub if supported as described in
-		XEP 0048
-		storage_type can be set to xml to force request to xml storage'''
+		"""
+		Get Bookmarks from storage or PubSub if supported as described in XEP
+		0048
+
+		storage_type can be set to xml to force request to xml storage
+		"""
 		if not self.connection:
 			return
 		if self.pubsub_supported and storage_type != 'xml':
@@ -1626,9 +1861,12 @@ class Connection(ConnectionHandlers):
 			self._request_bookmarks_xml()
 
 	def store_bookmarks(self, storage_type=None):
-		''' Send bookmarks to the storage namespace or PubSub if supported
+		"""
+		Send bookmarks to the storage namespace or PubSub if supported
+
 		storage_type can be set to 'pubsub' or 'xml' so store in only one method
-		else it will be stored on both'''
+		else it will be stored on both
+		"""
 		if not self.connection:
 			return
 		iq = common.xmpp.Node(tag='storage', attrs={'xmlns': 'storage:bookmarks'})
@@ -1670,7 +1908,9 @@ class Connection(ConnectionHandlers):
 			self.connection.send(iqA)
 
 	def get_annotations(self):
-		'''Get Annonations from storage as described in XEP 0048, and XEP 0145'''
+		"""
+		Get Annonations from storage as described in XEP 0048, and XEP 0145
+		"""
 		self.annotations = {}
 		if not self.connection:
 			return
@@ -1680,7 +1920,9 @@ class Connection(ConnectionHandlers):
 		self.connection.send(iq)
 
 	def store_annotations(self):
-		'''Set Annonations in private storage as described in XEP 0048, and XEP 0145'''
+		"""
+		Set Annonations in private storage as described in XEP 0048, and XEP 0145
+		"""
 		if not self.connection:
 			return
 		iq = common.xmpp.Iq(typ='set')
@@ -1695,7 +1937,9 @@ class Connection(ConnectionHandlers):
 
 
 	def get_metacontacts(self):
-		'''Get metacontacts list from storage as described in XEP 0049'''
+		"""
+		Get metacontacts list from storage as described in XEP 0049
+		"""
 		if not self.connection:
 			return
 		iq = common.xmpp.Iq(typ='get')
@@ -1707,7 +1951,9 @@ class Connection(ConnectionHandlers):
 		self.connection.send(iq)
 
 	def store_metacontacts(self, tags_list):
-		''' Send meta contacts to the storage namespace '''
+		"""
+		Send meta contacts to the storage namespace
+		"""
 		if not self.connection:
 			return
 		iq = common.xmpp.Iq(typ='set')
@@ -1787,7 +2033,7 @@ class Connection(ConnectionHandlers):
 				last_date = time.time() - gajim.config.get(
 					'muc_restore_timeout') * 60
 			else:
-				last_time = min(last_date, time.time() - gajim.config.get(
+				last_date = min(last_date, time.time() - gajim.config.get(
 					'muc_restore_timeout') * 60)
 			last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date))
 			t.setTag('history', {'maxstanzas': gajim.config.get(
@@ -1855,16 +2101,19 @@ class Connection(ConnectionHandlers):
 		self.connection.send(p)
 
 	def gc_got_disconnected(self, room_jid):
-		''' A groupchat got disconnected. This can be or purpose or not.
-		Save the time we quit to avoid duplicate logs AND be faster than get that
-		date from DB. Save it in mem AND in a small table (with fast access)
-		'''
-		log_time = time_time()
-		self.last_history_time[room_jid] = log_time
-		gajim.logger.set_room_last_message_time(room_jid, log_time)
+		"""
+		A groupchat got disconnected. This can be or purpose or not
+
+		Save the time we had last message to avoid duplicate logs AND be faster 
+		than get that date from DB. Save time that we have in mem in a small 
+		table (with fast access)
+		"""
+		gajim.logger.set_room_last_message_time(room_jid, self.last_history_time[room_jid])
 
 	def gc_set_role(self, room_jid, nick, role, reason = ''):
-		'''role is for all the life of the room so it's based on nick'''
+		"""
+		Role is for all the life of the room so it's based on nick
+		"""
 		if not self.connection:
 			return
 		iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\
@@ -1877,7 +2126,9 @@ class Connection(ConnectionHandlers):
 		self.connection.send(iq)
 
 	def gc_set_affiliation(self, room_jid, jid, affiliation, reason = ''):
-		'''affiliation is for all the life of the room so it's based on jid'''
+		"""
+		Affiliation is for all the life of the room so it's based on jid
+		"""
 		if not self.connection:
 			return
 		iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\
@@ -1921,26 +2172,6 @@ class Connection(ConnectionHandlers):
 		query.addChild(node = form)
 		self.connection.send(iq)
 
-	def gpg_passphrase(self, passphrase):
-		if self.gpg:
-			use_gpg_agent = gajim.config.get('use_gpg_agent')
-			if use_gpg_agent:
-				self.gpg.passphrase = None
-			else:
-				self.gpg.passphrase = passphrase
-
-	def ask_gpg_keys(self):
-		if self.gpg:
-			keys = self.gpg.get_keys()
-			return keys
-		return None
-
-	def ask_gpg_secrete_keys(self):
-		if self.gpg:
-			keys = self.gpg.get_secret_keys()
-			return keys
-		return None
-
 	def change_password(self, password):
 		if not self.connection:
 			return
@@ -1992,7 +2223,9 @@ class Connection(ConnectionHandlers):
 			_on_unregister_account_connect(self.connection)
 
 	def send_invite(self, room, to, reason='', continue_tag=False):
-		'''sends invitation'''
+		"""
+		Send invitation
+		"""
 		message=common.xmpp.Message(to = room)
 		c = message.addChild(name = 'x', namespace = common.xmpp.NS_MUC_USER)
 		c = c.addChild(name = 'invite', attrs={'to' : to})
@@ -2005,6 +2238,7 @@ class Connection(ConnectionHandlers):
 	def check_pingalive(self):
 		if self.awaiting_xmpp_ping_id:
 			# We haven't got the pong in time, disco and reconnect
+			log.warn("No reply received for keepalive ping. Reconnecting.")
 			self._disconnectedReconnCB()
 
 	def _reconnect_alarm(self):
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 11eefcd76..0cf0ab6b2 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -30,7 +30,6 @@
 
 import os
 import base64
-import socket
 import sys
 import operator
 import hashlib
@@ -41,17 +40,17 @@ from time import (altzone, daylight, gmtime, localtime, mktime, strftime,
 from calendar import timegm
 import datetime
 
-import socks5
 import common.xmpp
 
 from common import helpers
 from common import gajim
-from common import atom
-from common import pep
 from common import exceptions
 from common.commands import ConnectionCommands
 from common.pubsub import ConnectionPubSub
-from common.caps import ConnectionCaps
+from common.pep import ConnectionPEP
+from common.protocol.caps import ConnectionCaps
+from common.protocol.bytestream import ConnectionBytestream
+import common.caps_cache as capscache
 from common.nec import NetworkEvent
 if gajim.HAVE_FARSIGHT:
 	from common.jingle import ConnectionJingle
@@ -80,600 +79,32 @@ PRIVACY_ARRIVED = 'privacy_arrived'
 PEP_CONFIG = 'pep_config'
 HAS_IDLE = True
 try:
-	import idle
+#	import idle
+	import common.sleepy
 except Exception:
 	log.debug(_('Unable to load idle module'))
 	HAS_IDLE = False
 
-class ConnectionBytestream:
-	def __init__(self):
-		self.files_props = {}
-		self.awaiting_xmpp_ping_id = None
-
-	def is_transfer_stopped(self, file_props):
-		if 'error' in file_props and file_props['error'] != 0:
-			return True
-		if 'completed' in file_props and file_props['completed']:
-			return True
-		if 'connected' in file_props and file_props['connected'] == False:
-			return True
-		if 'stopped' not in file_props or not file_props['stopped']:
-			return False
-		return True
-
-	def send_success_connect_reply(self, streamhost):
-		''' send reply to the initiator of FT that we
-		made a connection
-		'''
-		if not self.connection or self.connected < 2:
-			return
-		if streamhost is None:
-			return None
-		iq = common.xmpp.Iq(to = streamhost['initiator'], typ = 'result',
-			frm = streamhost['target'])
-		iq.setAttr('id', streamhost['id'])
-		query = iq.setTag('query')
-		query.setNamespace(common.xmpp.NS_BYTESTREAM)
-		stream_tag = query.setTag('streamhost-used')
-		stream_tag.setAttr('jid', streamhost['jid'])
-		self.connection.send(iq)
-
-	def remove_transfers_for_contact(self, contact):
-		''' stop all active transfer for contact '''
-		for file_props in self.files_props.values():
-			if self.is_transfer_stopped(file_props):
-				continue
-			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'])
-			if contact.get_full_jid() == sender_jid:
-				file_props['error'] = -3
-				self.remove_transfer(file_props)
-
-	def remove_all_transfers(self):
-		''' stops and removes all active connections from the socks5 pool '''
-		for file_props in self.files_props.values():
-			self.remove_transfer(file_props, remove_from_list = False)
-		del(self.files_props)
-		self.files_props = {}
-
-	def remove_transfer(self, file_props, remove_from_list = True):
-		if file_props is None:
-			return
-		self.disconnect_transfer(file_props)
-		sid = file_props['sid']
-		gajim.socks5queue.remove_file_props(self.name, sid)
-
-		if remove_from_list:
-			if 'sid' in self.files_props:
-				del(self.files_props['sid'])
-
-	def disconnect_transfer(self, file_props):
-		if file_props is None:
-			return
-		if 'hash' in file_props:
-			gajim.socks5queue.remove_sender(file_props['hash'])
-
-		if 'streamhosts' in file_props:
-			for host in file_props['streamhosts']:
-				if 'idx' in host and host['idx'] > 0:
-					gajim.socks5queue.remove_receiver(host['idx'])
-					gajim.socks5queue.remove_sender(host['idx'])
-
-	def send_socks5_info(self, file_props, fast = True, receiver = None,
-		sender = None):
-		''' send iq for the present streamhosts and proxies '''
-		if not self.connection or self.connected < 2:
-			return
-		if not isinstance(self.peerhost, tuple):
-			return
-		port = gajim.config.get('file_transfers_port')
-		ft_add_hosts_to_send = gajim.config.get('ft_add_hosts_to_send')
-		cfg_proxies = gajim.config.get_per('accounts', self.name,
-			'file_transfer_proxies')
-		if receiver is None:
-			receiver = file_props['receiver']
-		if sender is None:
-			sender = file_props['sender']
-		proxyhosts = []
-		if fast and cfg_proxies:
-			proxies = [e.strip() for e in cfg_proxies.split(',')]
-			default = gajim.proxy65_manager.get_default_for_name(self.name)
-			if default:
-				# add/move default proxy at top of the others
-				if proxies.__contains__(default):
-					proxies.remove(default)
-				proxies.insert(0, default)
-
-			for proxy in proxies:
-				(host, _port, jid) = gajim.proxy65_manager.get_proxy(proxy, self.name)
-				if host is None:
-					continue
-				host_dict={
-					'state': 0,
-					'target': unicode(receiver),
-					'id': file_props['sid'],
-					'sid': file_props['sid'],
-					'initiator': proxy,
-					'host': host,
-					'port': unicode(_port),
-					'jid': jid
-				}
-				proxyhosts.append(host_dict)
-		sha_str = helpers.get_auth_sha(file_props['sid'], sender,
-			receiver)
-		file_props['sha_str'] = sha_str
-		ft_add_hosts = []
-		if ft_add_hosts_to_send:
-			ft_add_hosts_to_send = [e.strip() for e in ft_add_hosts_to_send.split(',')]
-			for ft_host in ft_add_hosts_to_send:
-				ft_add_hosts.append(ft_host)
-		listener = gajim.socks5queue.start_listener(port,
-			sha_str, self._result_socks5_sid, file_props['sid'])
-		if listener is None:
-			file_props['error'] = -5
-			self.dispatch('FILE_REQUEST_ERROR', (unicode(receiver), file_props,
-				''))
-			self._connect_error(unicode(receiver), file_props['sid'],
-				file_props['sid'], code = 406)
-			return
-
-		iq = common.xmpp.Protocol(name = 'iq', to = unicode(receiver),
-			typ = 'set')
-		file_props['request-id'] = 'id_' + file_props['sid']
-		iq.setID(file_props['request-id'])
-		query = iq.setTag('query')
-		query.setNamespace(common.xmpp.NS_BYTESTREAM)
-		query.setAttr('mode', 'plain')
-		query.setAttr('sid', file_props['sid'])
-		for ft_host in ft_add_hosts:
-			# The streamhost, if set
-			ostreamhost = common.xmpp.Node(tag = 'streamhost')
-			query.addChild(node = ostreamhost)
-			ostreamhost.setAttr('port', unicode(port))
-			ostreamhost.setAttr('host', ft_host)
-			ostreamhost.setAttr('jid', sender)
-		try:
-			# The ip we're connected to server with
-			my_ips = [self.peerhost[0]]
-			# all IPs from local DNS
-			for addr in socket.getaddrinfo(socket.gethostname(), None):
-				if not addr[4][0] in my_ips and not addr[4][0].startswith('127'):
-					my_ips.append(addr[4][0])
-			for ip in my_ips:
-				streamhost = common.xmpp.Node(tag = 'streamhost')
-				query.addChild(node = streamhost)
-				streamhost.setAttr('port', unicode(port))
-				streamhost.setAttr('host', ip)
-				streamhost.setAttr('jid', sender)
-		except socket.gaierror:
-			self.dispatch('ERROR', (_('Wrong host'),
-				_('Invalid local address? :-O')))
-
-		if fast and proxyhosts != [] and gajim.config.get_per('accounts',
-		self.name, 'use_ft_proxies'):
-			file_props['proxy_receiver'] = unicode(receiver)
-			file_props['proxy_sender'] = unicode(sender)
-			file_props['proxyhosts'] = proxyhosts
-			for proxyhost in proxyhosts:
-				streamhost = common.xmpp.Node(tag = 'streamhost')
-				query.addChild(node=streamhost)
-				streamhost.setAttr('port', proxyhost['port'])
-				streamhost.setAttr('host', proxyhost['host'])
-				streamhost.setAttr('jid', proxyhost['jid'])
-
-				# don't add the proxy child tag for streamhosts, which are proxies
-				# proxy = streamhost.setTag('proxy')
-				# proxy.setNamespace(common.xmpp.NS_STREAM)
-		self.connection.send(iq)
-
-	def send_file_rejection(self, file_props, code='403', typ=None):
-		''' informs sender that we refuse to download the file
-		typ is used when code = '400', in this case typ can be 'strean' for
-		invalid stream or 'profile' for invalid profile'''
-		# user response to ConfirmationDialog may come after we've disconneted
-		if not self.connection or self.connected < 2:
-			return
-		iq = common.xmpp.Protocol(name = 'iq',
-			to = unicode(file_props['sender']), typ = 'error')
-		iq.setAttr('id', file_props['request-id'])
-		if code == '400' and typ in ('stream', 'profile'):
-			name = 'bad-request'
-			text = ''
-		else:
-			name = 'forbidden'
-			text = 'Offer Declined'
-		err = common.xmpp.ErrorNode(code=code, typ='cancel', name=name, text=text)
-		if code == '400' and typ in ('stream', 'profile'):
-			if typ == 'stream':
-				err.setTag('no-valid-streams', namespace=common.xmpp.NS_SI)
-			else:
-				err.setTag('bad-profile', namespace=common.xmpp.NS_SI)
-		iq.addChild(node=err)
-		self.connection.send(iq)
-
-	def send_file_approval(self, file_props):
-		''' send iq, confirming that we want to download the file '''
-		# user response to ConfirmationDialog may come after we've disconneted
-		if not self.connection or self.connected < 2:
-			return
-		iq = common.xmpp.Protocol(name = 'iq',
-			to = unicode(file_props['sender']), typ = 'result')
-		iq.setAttr('id', file_props['request-id'])
-		si = iq.setTag('si')
-		si.setNamespace(common.xmpp.NS_SI)
-		if 'offset' in file_props and file_props['offset']:
-			file_tag = si.setTag('file')
-			file_tag.setNamespace(common.xmpp.NS_FILE)
-			range_tag = file_tag.setTag('range')
-			range_tag.setAttr('offset', file_props['offset'])
-		feature = si.setTag('feature')
-		feature.setNamespace(common.xmpp.NS_FEATURE)
-		_feature = common.xmpp.DataForm(typ='submit')
-		feature.addChild(node=_feature)
-		field = _feature.setField('stream-method')
-		field.delAttr('type')
-		field.setValue(common.xmpp.NS_BYTESTREAM)
-		self.connection.send(iq)
-
-	def send_file_request(self, file_props):
-		''' send iq for new FT request '''
-		if not self.connection or self.connected < 2:
-			return
-		our_jid = gajim.get_jid_from_account(self.name)
-		resource = self.server_resource
-		frm = our_jid + '/' + resource
-		file_props['sender'] = frm
-		fjid = file_props['receiver'].jid + '/' + file_props['receiver'].resource
-		iq = common.xmpp.Protocol(name = 'iq', to = fjid,
-			typ = 'set')
-		iq.setID(file_props['sid'])
-		self.files_props[file_props['sid']] = file_props
-		si = iq.setTag('si')
-		si.setNamespace(common.xmpp.NS_SI)
-		si.setAttr('profile', common.xmpp.NS_FILE)
-		si.setAttr('id', file_props['sid'])
-		file_tag = si.setTag('file')
-		file_tag.setNamespace(common.xmpp.NS_FILE)
-		file_tag.setAttr('name', file_props['name'])
-		file_tag.setAttr('size', file_props['size'])
-		desc = file_tag.setTag('desc')
-		if 'desc' in file_props:
-			desc.setData(file_props['desc'])
-		file_tag.setTag('range')
-		feature = si.setTag('feature')
-		feature.setNamespace(common.xmpp.NS_FEATURE)
-		_feature = common.xmpp.DataForm(typ='form')
-		feature.addChild(node=_feature)
-		field = _feature.setField('stream-method')
-		field.setAttr('type', 'list-single')
-		field.addOption(common.xmpp.NS_BYTESTREAM)
-		self.connection.send(iq)
-
-	def _result_socks5_sid(self, sid, hash_id):
-		''' store the result of sha message from auth. '''
-		if sid not in self.files_props:
-			return
-		file_props = self.files_props[sid]
-		file_props['hash'] = hash_id
-		return
-
-	def _connect_error(self, to, _id, sid, code=404):
-		''' cb, when there is an error establishing BS connection, or
-		when connection is rejected'''
-		if not self.connection or self.connected < 2:
-			return
-		msg_dict = {
-			404: 'Could not connect to given hosts',
-			405: 'Cancel',
-			406: 'Not acceptable',
-		}
-		msg = msg_dict[code]
-		iq = None
-		iq = common.xmpp.Protocol(name = 'iq', to = to,
-			typ = 'error')
-		iq.setAttr('id', _id)
-		err = iq.setTag('error')
-		err.setAttr('code', unicode(code))
-		err.setData(msg)
-		self.connection.send(iq)
-		if code == 404:
-			file_props = gajim.socks5queue.get_file_props(self.name, sid)
-			if file_props is not None:
-				self.disconnect_transfer(file_props)
-				file_props['error'] = -3
-				self.dispatch('FILE_REQUEST_ERROR', (to, file_props, msg))
-
-	def _proxy_auth_ok(self, proxy):
-		'''cb, called after authentication to proxy server '''
-		if not self.connection or self.connected < 2:
-			return
-		file_props = self.files_props[proxy['sid']]
-		iq = common.xmpp.Protocol(name = 'iq', to = proxy['initiator'],
-		typ = 'set')
-		auth_id = "au_" + proxy['sid']
-		iq.setID(auth_id)
-		query = iq.setTag('query')
-		query.setNamespace(common.xmpp.NS_BYTESTREAM)
-		query.setAttr('sid', proxy['sid'])
-		activate = query.setTag('activate')
-		activate.setData(file_props['proxy_receiver'])
-		iq.setID(auth_id)
-		self.connection.send(iq)
-
-	# register xmpppy handlers for bytestream and FT stanzas
-	def _bytestreamErrorCB(self, con, iq_obj):
-		log.debug('_bytestreamErrorCB')
-		id_ = unicode(iq_obj.getAttr('id'))
-		frm = helpers.get_full_jid_from_iq(iq_obj)
-		query = iq_obj.getTag('query')
-		gajim.proxy65_manager.error_cb(frm, query)
-		jid = helpers.get_jid_from_iq(iq_obj)
-		id_ = id_[3:]
-		if id_ not in self.files_props:
-			return
-		file_props = self.files_props[id_]
-		file_props['error'] = -4
-		self.dispatch('FILE_REQUEST_ERROR', (jid, file_props, ''))
-		raise common.xmpp.NodeProcessed
-
-	def _bytestreamSetCB(self, con, iq_obj):
-		log.debug('_bytestreamSetCB')
-		target = unicode(iq_obj.getAttr('to'))
-		id_ = unicode(iq_obj.getAttr('id'))
-		query = iq_obj.getTag('query')
-		sid = unicode(query.getAttr('sid'))
-		file_props = gajim.socks5queue.get_file_props(
-			self.name, sid)
-		streamhosts=[]
-		for item in query.getChildren():
-			if item.getName() == 'streamhost':
-				host_dict={
-					'state': 0,
-					'target': target,
-					'id': id_,
-					'sid': sid,
-					'initiator': helpers.get_full_jid_from_iq(iq_obj)
-				}
-				for attr in item.getAttrs():
-					host_dict[attr] = item.getAttr(attr)
-				streamhosts.append(host_dict)
-		if file_props is None:
-			if sid in self.files_props:
-				file_props = self.files_props[sid]
-				file_props['fast'] = streamhosts
-				if file_props['type'] == 's': # FIXME: remove fast xmlns
-					# only psi do this
-
-					if 'streamhosts' in file_props:
-						file_props['streamhosts'].extend(streamhosts)
-					else:
-						file_props['streamhosts'] = streamhosts
-					if not gajim.socks5queue.get_file_props(self.name, sid):
-						gajim.socks5queue.add_file_props(self.name, file_props)
-					gajim.socks5queue.connect_to_hosts(self.name, sid,
-						self.send_success_connect_reply, None)
-				raise common.xmpp.NodeProcessed
-
-		file_props['streamhosts'] = streamhosts
-		if file_props['type'] == 'r':
-			gajim.socks5queue.connect_to_hosts(self.name, sid,
-				self.send_success_connect_reply, self._connect_error)
-		raise common.xmpp.NodeProcessed
-
-	def _ResultCB(self, con, iq_obj):
-		log.debug('_ResultCB')
-		# if we want to respect xep-0065 we have to check for proxy
-		# activation result in any result iq
-		real_id = unicode(iq_obj.getAttr('id'))
-		if real_id == self.awaiting_xmpp_ping_id:
-			self.awaiting_xmpp_ping_id = None
-			return
-		if not real_id.startswith('au_'):
-			return
-		frm = helpers.get_full_jid_from_iq(iq_obj)
-		id_ = real_id[3:]
-		if id_ in self.files_props:
-			file_props = self.files_props[id_]
-			if file_props['streamhost-used']:
-				for host in file_props['proxyhosts']:
-					if host['initiator'] == frm and 'idx' in host:
-						gajim.socks5queue.activate_proxy(host['idx'])
-						raise common.xmpp.NodeProcessed
-
-	def _bytestreamResultCB(self, con, iq_obj):
-		log.debug('_bytestreamResultCB')
-		frm = helpers.get_full_jid_from_iq(iq_obj)
-		real_id = unicode(iq_obj.getAttr('id'))
-		query = iq_obj.getTag('query')
-		gajim.proxy65_manager.resolve_result(frm, query)
-
-		try:
-			streamhost = query.getTag('streamhost-used')
-		except Exception: # this bytestream result is not what we need
-			pass
-		id_ = real_id[3:]
-		if id_ in self.files_props:
-			file_props = self.files_props[id_]
-		else:
-			raise common.xmpp.NodeProcessed
-		if streamhost is None:
-			# proxy approves the activate query
-			if real_id.startswith('au_'):
-				if 'streamhost-used' not in file_props or \
-				file_props['streamhost-used'] is False:
-					raise common.xmpp.NodeProcessed
-				if 'proxyhosts' not in file_props:
-					raise common.xmpp.NodeProcessed
-				for host in file_props['proxyhosts']:
-					if host['initiator'] == frm and \
-					unicode(query.getAttr('sid')) == file_props['sid']:
-						gajim.socks5queue.activate_proxy(host['idx'])
-						break
-			raise common.xmpp.NodeProcessed
-		jid = helpers.parse_jid(streamhost.getAttr('jid'))
-		if 'streamhost-used' in file_props and \
-			file_props['streamhost-used'] is True:
-			raise common.xmpp.NodeProcessed
-
-		if real_id.startswith('au_'):
-			if 'stopped' in file and file_props['stopped']:
-				self.remove_transfer(file_props)
-			else:
-				gajim.socks5queue.send_file(file_props, self.name)
-			raise common.xmpp.NodeProcessed
-
-		proxy = None
-		if 'proxyhosts' in file_props:
-			for proxyhost in file_props['proxyhosts']:
-				if proxyhost['jid'] == jid:
-					proxy = proxyhost
-
-		if proxy is not None:
-			file_props['streamhost-used'] = True
-			if 'streamhosts' not in file_props:
-				file_props['streamhosts'] = []
-			file_props['streamhosts'].append(proxy)
-			file_props['is_a_proxy'] = True
-			receiver = socks5.Socks5Receiver(gajim.idlequeue, proxy,
-				file_props['sid'], file_props)
-			gajim.socks5queue.add_receiver(self.name, receiver)
-			proxy['idx'] = receiver.queue_idx
-			gajim.socks5queue.on_success = self._proxy_auth_ok
-			raise common.xmpp.NodeProcessed
-
-		else:
-			if 'stopped' in file_props and file_props['stopped']:
-				self.remove_transfer(file_props)
-			else:
-				gajim.socks5queue.send_file(file_props, self.name)
-			if 'fast' in file_props:
-				fasts = file_props['fast']
-				if len(fasts) > 0:
-					self._connect_error(frm, fasts[0]['id'], file_props['sid'],
-						code = 406)
-
-		raise common.xmpp.NodeProcessed
-
-	def _siResultCB(self, con, iq_obj):
-		log.debug('_siResultCB')
-		id_ = iq_obj.getAttr('id')
-		if id_ not in self.files_props:
-			# no such jid
-			return
-		file_props = self.files_props[id_]
-		if file_props is None:
-			# file properties for jid is none
-			return
-		if 'request-id' in file_props:
-			# we have already sent streamhosts info
-			return
-		file_props['receiver'] = helpers.get_full_jid_from_iq(iq_obj)
-		si = iq_obj.getTag('si')
-		file_tag = si.getTag('file')
-		range_tag = None
-		if file_tag:
-			range_tag = file_tag.getTag('range')
-		if range_tag:
-			offset = range_tag.getAttr('offset')
-			if offset:
-				file_props['offset'] = int(offset)
-			length = range_tag.getAttr('length')
-			if length:
-				file_props['length'] = int(length)
-		feature = si.setTag('feature')
-		if feature.getNamespace() != common.xmpp.NS_FEATURE:
-			return
-		form_tag = feature.getTag('x')
-		form = common.xmpp.DataForm(node=form_tag)
-		field = form.getField('stream-method')
-		if field.getValue() != common.xmpp.NS_BYTESTREAM:
-			return
-		self.send_socks5_info(file_props, fast = True)
-		raise common.xmpp.NodeProcessed
-
-	def _siSetCB(self, con, iq_obj):
-		log.debug('_siSetCB')
-		jid = helpers.get_jid_from_iq(iq_obj)
-		file_props = {'type': 'r'}
-		file_props['sender'] = helpers.get_full_jid_from_iq(iq_obj)
-		file_props['request-id'] = unicode(iq_obj.getAttr('id'))
-		si = iq_obj.getTag('si')
-		profile = si.getAttr('profile')
-		mime_type = si.getAttr('mime-type')
-		if profile != common.xmpp.NS_FILE:
-			self.send_file_rejection(file_props, code='400', typ='profile')
-			raise common.xmpp.NodeProcessed
-		feature_tag = si.getTag('feature', namespace=common.xmpp.NS_FEATURE)
-		if not feature_tag:
-			return
-		form_tag = feature_tag.getTag('x', namespace=common.xmpp.NS_DATA)
-		if not form_tag:
-			return
-		form = common.dataforms.ExtendForm(node=form_tag)
-		for f in form.iter_fields():
-			if f.var == 'stream-method' and f.type == 'list-single':
-				values = [o[1] for o in f.options]
-				if common.xmpp.NS_BYTESTREAM in values:
-					break
-		else:
-			self.send_file_rejection(file_props, code='400', typ='stream')
-			raise common.xmpp.NodeProcessed
-		file_tag = si.getTag('file')
-		for attribute in file_tag.getAttrs():
-			if attribute in ('name', 'size', 'hash', 'date'):
-				val = file_tag.getAttr(attribute)
-				if val is None:
-					continue
-				file_props[attribute] = val
-		file_desc_tag = file_tag.getTag('desc')
-		if file_desc_tag is not None:
-			file_props['desc'] = file_desc_tag.getData()
-
-		if mime_type is not None:
-			file_props['mime-type'] = mime_type
-		our_jid = gajim.get_jid_from_account(self.name)
-		resource = self.server_resource
-		file_props['receiver'] = our_jid + '/' + resource
-		file_props['sid'] = unicode(si.getAttr('id'))
-		file_props['transfered_size'] = []
-		gajim.socks5queue.add_file_props(self.name, file_props)
-		self.dispatch('FILE_REQUEST', (jid, file_props))
-		raise common.xmpp.NodeProcessed
-
-	def _siErrorCB(self, con, iq_obj):
-		log.debug('_siErrorCB')
-		si = iq_obj.getTag('si')
-		profile = si.getAttr('profile')
-		if profile != common.xmpp.NS_FILE:
-			return
-		id_ = iq_obj.getAttr('id')
-		if id_ not in self.files_props:
-			# no such jid
-			return
-		file_props = self.files_props[id_]
-		if file_props is None:
-			# file properties for jid is none
-			return
-		jid = helpers.get_jid_from_iq(iq_obj)
-		file_props['error'] = -3
-		self.dispatch('FILE_REQUEST_ERROR', (jid, file_props, ''))
-		raise common.xmpp.NodeProcessed
 
 class ConnectionDisco:
-	''' hold xmpppy handlers and public methods for discover services'''
+	"""
+	Holds xmpppy handlers and public methods for discover services
+	"""
+
 	def discoverItems(self, jid, node = None, id_prefix = None):
-		'''According to XEP-0030: jid is mandatory,
-		name, node, action is optional.'''
+		"""
+		According to XEP-0030:
+			jid is mandatory;
+			name, node, action is optional.
+		"""
 		self._discover(common.xmpp.NS_DISCO_ITEMS, jid, node, id_prefix)
 
 	def discoverInfo(self, jid, node = None, id_prefix = None):
-		'''According to XEP-0030:
+		"""
+		According to XEP-0030:
 			For identity: category, type is mandatory, name is optional.
-			For feature: var is mandatory'''
+			For feature: var is mandatory.
+		"""
 		self._discover(common.xmpp.NS_DISCO_INFO, jid, node, id_prefix)
 
 	def request_register_agent_info(self, agent):
@@ -693,6 +124,12 @@ class ConnectionDisco:
 		if resp.getType() == 'result':
 			self.dispatch('INFORMATION', (_('Registration succeeded'),
 				_('Registration with agent %s succeeded') % agent))
+			self.request_subscription(agent, auto_auth=True)
+			self.agent_registrations[agent]['roster_push'] = True
+			if self.agent_registrations[agent]['sub_received']:
+				p = common.xmpp.Presence(agent, 'subscribed')
+				p = self.add_sha(p)
+				self.connection.send(p)
 		if resp.getType() == 'error':
 			self.dispatch('ERROR', (_('Registration failed'), _('Registration with'
 				' agent %(agent)s failed with error %(error)s: %(error_msg)s') % {
@@ -703,20 +140,23 @@ class ConnectionDisco:
 		if not self.connection or self.connected < 2:
 			return
 		if is_form:
-			iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to = agent)
+			iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to=agent)
 			query = iq.getTag('query')
 			info.setAttr('type', 'submit')
-			query.addChild(node = info)
+			query.addChild(node=info)
 			self.connection.SendAndCallForResponse(iq, self._agent_registered_cb,
 				{'agent': agent})
 		else:
 			# fixed: blocking
-			common.xmpp.features_nb.register(self.connection, agent, info, None)
+			common.xmpp.features_nb.register(self.connection, agent, info,
+				self._agent_registered_cb, {'agent': agent})
+		self.agent_registrations[agent] = {'roster_push': False,
+			'sub_received': False}
 
-	def _discover(self, ns, jid, node = None, id_prefix = None):
+	def _discover(self, ns, jid, node=None, id_prefix=None):
 		if not self.connection or self.connected < 2:
 			return
-		iq = common.xmpp.Iq(typ = 'get', to = jid, queryNS = ns)
+		iq = common.xmpp.Iq(typ='get', to=jid, queryNS=ns)
 		if id_prefix:
 			id_ = self.connection.getAnID()
 			iq.setID('%s%s' % (id_prefix, id_))
@@ -729,18 +169,19 @@ class ConnectionDisco:
 		self._IqCB(con, resp)
 
 	def _discoGetCB(self, con, iq_obj):
-		''' get disco info '''
+		"""
+		Get disco info
+		"""
 		if not self.connection or self.connected < 2:
 			return
 		frm = helpers.get_full_jid_from_iq(iq_obj)
 		to = unicode(iq_obj.getAttr('to'))
 		id_ = unicode(iq_obj.getAttr('id'))
-		iq = common.xmpp.Iq(to = frm, typ = 'result', queryNS =\
-			common.xmpp.NS_DISCO, frm = to)
+		iq = common.xmpp.Iq(to=frm, typ='result', queryNS=common.xmpp.NS_DISCO,
+			frm=to)
 		iq.setAttr('id', id_)
 		query = iq.setTag('query')
-		query.setAttr('node','http://gajim.org#' + gajim.version.split('-',
-			1)[0])
+		query.setAttr('node','http://gajim.org#' + gajim.version.split('-', 1)[0])
 		for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI,
 		common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS):
 			feature = common.xmpp.Node('feature')
@@ -781,8 +222,7 @@ class ConnectionDisco:
 				continue
 			items.append(attr)
 		jid = helpers.get_full_jid_from_iq(iq_obj)
-		hostname = gajim.config.get_per('accounts', self.name,
-													'hostname')
+		hostname = gajim.config.get_per('accounts', self.name, 'hostname')
 		id_ = iq_obj.getID()
 		if jid == hostname and id_[:6] == 'Gajim_':
 			for item in items:
@@ -945,10 +385,10 @@ class ConnectionVcard:
 		if self.vcard_sha is not None:
 			c.setTagData('photo', self.vcard_sha)
 		if send_caps:
-			return self.add_caps(p)
+			return self._add_caps(p)
 		return p
 
-	def add_caps(self, p):
+	def _add_caps(self, p):
 		''' advertise our capabilities in presence stanza (xep-0115)'''
 		c = p.setTag('c', namespace = common.xmpp.NS_CAPS)
 		c.setAttr('hash', 'sha-1')
@@ -956,7 +396,7 @@ class ConnectionVcard:
 		c.setAttr('ver', gajim.caps_hash[self.name])
 		return p
 
-	def node_to_dict(self, node):
+	def _node_to_dict(self, node):
 		dict_ = {}
 		for info in node.getChildren():
 			name = info.getName()
@@ -974,7 +414,7 @@ class ConnectionVcard:
 					dict_[name][c.getName()] = c.getData()
 		return dict_
 
-	def save_vcard_to_hd(self, full_jid, card):
+	def _save_vcard_to_hd(self, full_jid, card):
 		jid, nick = gajim.get_room_and_nick_from_fjid(full_jid)
 		puny_jid = helpers.sanitize_filename(jid)
 		path = os.path.join(gajim.VCARD_PATH, puny_jid)
@@ -999,9 +439,11 @@ class ConnectionVcard:
 			self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
 
 	def get_cached_vcard(self, fjid, is_fake_jid = False):
-		'''return the vcard as a dict
-		return {} if vcard was too old
-		return None if we don't have cached vcard'''
+		"""
+		Return the vcard as a dict.
+		Return {} if vcard was too old.
+		Return None if we don't have cached vcard.
+		"""
 		jid, nick = gajim.get_room_and_nick_from_fjid(fjid)
 		puny_jid = helpers.sanitize_filename(jid)
 		if is_fake_jid:
@@ -1021,7 +463,7 @@ class ConnectionVcard:
 			# We are unable to parse it. Remove it
 			os.remove(path_to_file)
 			return None
-		vcard = self.node_to_dict(card)
+		vcard = self._node_to_dict(card)
 		if 'PHOTO' in vcard:
 			if not isinstance(vcard['PHOTO'], dict):
 				del vcard['PHOTO']
@@ -1035,10 +477,14 @@ class ConnectionVcard:
 		vcard['resource'] = gajim.get_resource_from_jid(fjid)
 		return vcard
 
-	def request_vcard(self, jid = None, groupchat_jid = None):
-		'''request the VCARD. If groupchat_jid is not nul, it means we request a vcard
-		to a fake jid, like in private messages in groupchat. jid can be the
-		real jid of the contact, but we want to consider it comes from a fake jid'''
+	def request_vcard(self, jid=None, groupchat_jid=None):
+		"""
+		Request the VCARD
+
+		If groupchat_jid is not null, it means we request a vcard to a fake jid,
+		like in private messages in groupchat. jid can be the real jid of the
+		contact, but we want to consider it comes from a fake jid
+		"""
 		if not self.connection or self.connected < 2:
 			return
 		iq = common.xmpp.Iq(typ = 'get')
@@ -1126,7 +572,7 @@ class ConnectionVcard:
 
 				# Save it to file
 				our_jid = gajim.get_jid_from_account(self.name)
-				self.save_vcard_to_hd(our_jid, vcard_iq)
+				self._save_vcard_to_hd(our_jid, vcard_iq)
 
 				# Send new presence if sha changed and we are not invisible
 				if self.vcard_sha != new_sha and gajim.SHOW_LIST[self.connected] !=\
@@ -1155,7 +601,7 @@ class ConnectionVcard:
 			if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error':
 				if frm and frm != our_jid:
 					# Write an empty file
-					self.save_vcard_to_hd(frm, '')
+					self._save_vcard_to_hd(frm, '')
 					jid, resource = gajim.get_room_and_nick_from_fjid(frm)
 					self.dispatch('VCARD', {'jid': jid, 'resource': resource})
 				elif frm == our_jid:
@@ -1233,8 +679,9 @@ class ConnectionVcard:
 		del self.awaiting_answers[id_]
 
 	def _vCardCB(self, con, vc):
-		'''Called when we receive a vCard
-		Parse the vCard and send it to plugins'''
+		"""
+		Called when we receive a vCard Parse the vCard and send it to plugins
+		"""
 		if not vc.getTag('vCard'):
 			return
 		if not vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD:
@@ -1253,7 +700,7 @@ class ConnectionVcard:
 		else:
 			who = frm = our_jid
 		card = vc.getChildren()[0]
-		vcard = self.node_to_dict(card)
+		vcard = self._node_to_dict(card)
 		photo_decoded = None
 		if 'PHOTO' in vcard and isinstance(vcard['PHOTO'], dict) and \
 		'BINVAL' in vcard['PHOTO']:
@@ -1270,7 +717,7 @@ class ConnectionVcard:
 			card.getTag('PHOTO').setTagData('SHA', avatar_sha)
 
 		# Save it to file
-		self.save_vcard_to_hd(who, card)
+		self._save_vcard_to_hd(who, card)
 		# Save the decoded avatar to a separate file too, and generate files for dbus notifications
 		puny_jid = helpers.sanitize_filename(frm)
 		puny_nick = None
@@ -1340,8 +787,9 @@ class ConnectionHandlersBase:
 		self.sessions = {}
 
 	def get_sessions(self, jid):
-		'''get all sessions for the given full jid'''
-
+		"""
+		Get all sessions for the given full jid
+		"""
 		if not gajim.interface.is_pm_contact(jid, self.name):
 			jid = gajim.get_jid_without_resource(jid)
 
@@ -1351,9 +799,10 @@ class ConnectionHandlersBase:
 			return []
 
 	def get_or_create_session(self, fjid, thread_id):
-		'''returns an existing session between this connection and 'jid', returns a
-		new one if none exist.'''
-
+		"""
+		Return an existing session between this connection and 'jid', returns a
+		new one if none exist
+		"""
 		pm = True
 		jid = fjid
 
@@ -1381,7 +830,9 @@ class ConnectionHandlersBase:
 			return None
 
 	def terminate_sessions(self, send_termination=False):
-		'''send termination messages and delete all active sessions'''
+		"""
+		Send termination messages and delete all active sessions
+		"""
 		for jid in self.sessions:
 			for thread_id in self.sessions[jid]:
 				self.sessions[jid][thread_id].terminate(send_termination)
@@ -1400,10 +851,11 @@ class ConnectionHandlersBase:
 			del self.sessions[jid]
 
 	def find_null_session(self, jid):
-		'''finds all of the sessions between us and a remote jid in which we
-haven't received a thread_id yet and returns the session that we last
-sent a message to.'''
-
+		"""
+		Find all of the sessions between us and a remote jid in which we haven't
+		received a thread_id yet and returns the session that we last sent a
+		message to
+		"""
 		sessions = self.sessions[jid].values()
 
 		# sessions that we haven't received a thread ID in
@@ -1420,8 +872,9 @@ sent a message to.'''
 			return None
 
 	def find_controlless_session(self, jid, resource=None):
-		'''find an active session that doesn't have a control attached'''
-
+		"""
+		Find an active session that doesn't have a control attached
+		"""
 		try:
 			sessions = self.sessions[jid].values()
 
@@ -1439,8 +892,12 @@ sent a message to.'''
 			return None
 
 	def make_new_session(self, jid, thread_id=None, type_='chat', cls=None):
-		'''create and register a new session. thread_id=None to generate one.
-		type_ should be 'chat' or 'pm'.'''
+		"""
+		Create and register a new session
+
+		thread_id=None to generate one.
+		type_ should be 'chat' or 'pm'.
+		"""
 		if not cls:
 			cls = gajim.default_session_type
 
@@ -1458,12 +915,20 @@ sent a message to.'''
 
 		return sess
 
-class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionCaps, ConnectionHandlersBase, ConnectionJingle):
+class ConnectionHandlers(ConnectionVcard, ConnectionBytestream,
+		ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionPEP,
+		ConnectionCaps, ConnectionHandlersBase, ConnectionJingle):
 	def __init__(self):
+		global HAS_IDLE
 		ConnectionVcard.__init__(self)
 		ConnectionBytestream.__init__(self)
 		ConnectionCommands.__init__(self)
 		ConnectionPubSub.__init__(self)
+		ConnectionPEP.__init__(self, account=self.name, dispatcher=self,
+			pubsub_connection=self)
+		ConnectionCaps.__init__(self, account=self.name,
+			dispatch_event=self.dispatch, capscache=capscache.capscache,
+			client_caps_factory=capscache.create_suitable_client_caps)
 		ConnectionJingle.__init__(self)
 		ConnectionHandlersBase.__init__(self)
 		self.gmail_url = None
@@ -1482,9 +947,10 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		self.continue_connect_info = None
 
 		try:
-			idle.init()
+			self.sleeper = common.sleepy.Sleepy()
+#			idle.init()
+			HAS_IDLE = True
 		except Exception:
-			global HAS_IDLE
 			HAS_IDLE = False
 
 		self.gmail_last_tid = None
@@ -1530,16 +996,14 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 			self.dispatch('ENTITY_TIME', (jid_stripped, resource, ''))
 			self.entity_time_ids.remove(id_)
 			return
-		if id_ == self.awaiting_xmpp_ping_id:
-			self.awaiting_xmpp_ping_id = None
 		errmsg = iq_obj.getErrorMsg()
 		errcode = iq_obj.getErrorCode()
 		self.dispatch('ERROR_ANSWER', (id_, jid_from, errmsg, errcode))
 
 	def _PrivateCB(self, con, iq_obj):
-		'''
+		"""
 		Private Data (XEP 048 and 049)
-		'''
+		"""
 		log.debug('PrivateCB')
 		query = iq_obj.getTag('query')
 		storage = query.getTag('storage')
@@ -1566,8 +1030,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 					self.annotations[jid] = annotation
 
 	def _parse_bookmarks(self, storage, storage_type):
-		'''storage_type can be 'pubsub' or 'xml' to tell from where we got
-		bookmarks'''
+		"""
+		storage_type can be 'pubsub' or 'xml' to tell from where we got bookmarks
+		"""
 		# Bookmarked URLs and Conferences
 		# http://www.xmpp.org/extensions/xep-0048.html
 		resend_to_pubsub = False
@@ -1650,15 +1115,19 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		raise common.xmpp.NodeProcessed
 
 	def _LastCB(self, con, iq_obj):
+		global HAS_IDLE
 		log.debug('LastCB')
 		if not self.connection or self.connected < 2:
 			return
-		iq_obj = iq_obj.buildReply('result')
-		qp = iq_obj.getTag('query')
-		if not HAS_IDLE:
-			qp.attrs['seconds'] = '0'
+		if HAS_IDLE and gajim.config.get_per('accounts', self.name,
+		'send_idle_time'):
+			iq_obj = iq_obj.buildReply('result')
+			qp = iq_obj.getTag('query')
+			qp.attrs['seconds'] = int(self.sleeper.getIdleSec())
 		else:
-			qp.attrs['seconds'] = idle.getIdleSec()
+			iq_obj = iq_obj.buildReply('error')
+			err = common.xmpp.ErrorNode(name=common.xmpp.NS_STANZAS+' service-unavailable')
+			iq_obj.addChild(node=err)
 
 		self.connection.send(iq_obj)
 		raise common.xmpp.NodeProcessed
@@ -1741,7 +1210,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 			# wrong answer
 			return
 		tzo = qp.getTag('tzo').getData()
-		if tzo == 'Z':
+		if tzo.lower() == 'z':
 			tzo = '0:0'
 		tzoh, tzom = tzo.split(':')
 		utc_time = qp.getTag('utc').getData()
@@ -1781,7 +1250,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		self.dispatch('ENTITY_TIME', (jid_stripped, resource, time_info))
 
 	def _gMailNewMailCB(self, con, gm):
-		'''Called when we get notified of new mail messages in gmail account'''
+		"""
+		Called when we get notified of new mail messages in gmail account
+		"""
 		if not self.connection or self.connected < 2:
 			return
 		if not gm.getTag('new-mail'):
@@ -1803,7 +1274,10 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 			raise common.xmpp.NodeProcessed
 
 	def _gMailQueryCB(self, con, gm):
-		'''Called when we receive results from Querying the server for mail messages in gmail account'''
+		"""
+		Called when we receive results from Querying the server for mail messages
+		in gmail account
+		"""
 		if not gm.getTag('mailbox'):
 			return
 		self.gmail_url = gm.getTag('mailbox').getAttr('url')
@@ -1849,7 +1323,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 			raise common.xmpp.NodeProcessed
 
 	def _rosterItemExchangeCB(self, con, msg):
-		''' XEP-0144 Roster Item Echange '''
+		"""
+		XEP-0144 Roster Item Echange
+		"""
 		exchange_items_list = {}
 		jid_from = helpers.get_full_jid_from_iq(msg)
 		items_list = msg.getTag('x').getChildren()
@@ -1866,9 +1342,23 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 				log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid'))
 				continue
 			name = item.getAttr('name')
-			groups=[]
+			contact = gajim.contacts.get_contact(self.name, jid)
+			groups = []
+			same_groups = True
 			for group in item.getTags('group'):
 				groups.append(group.getData())
+				# check that all suggested groups are in the groups we have for this
+				# contact
+				if not contact or group not in contact.groups:
+					same_groups = False
+			if contact:
+				# check that all groups we have for this contact are in the
+				# suggested groups
+				for group in contact.groups:
+					if group not in groups:
+						same_groups = False
+				if contact.sub in ('both', 'to') and same_groups:
+					continue
 			exchange_items_list[jid] = []
 			exchange_items_list[jid].append(name)
 			exchange_items_list[jid].append(groups)
@@ -1877,7 +1367,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		raise common.xmpp.NodeProcessed
 
 	def _messageCB(self, con, msg):
-		'''Called when we receive a message'''
+		"""
+		Called when we receive a message
+		"""
 		log.debug('MessageCB')
 		
 		gajim.nec.push_incoming_event(NetworkEvent('raw-message-received',
@@ -1887,13 +1379,6 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		
 		mtype = msg.getType()												   
 												   
-		# check if the message is pubsub#event
-		if msg.getTag('event') is not None:
-			if mtype == 'groupchat':
-				return
-			if msg.getTag('error') is None:
-				self._pubsubEventCB(con, msg)
-			return
 
 		# check if the message is a roster item exchange (XEP-0144)
 		if msg.getTag('x', namespace=common.xmpp.NS_ROSTERX):
@@ -1911,6 +1396,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		except helpers.InvalidFormat:
 			self.dispatch('ERROR', (_('Invalid Jabber ID'),
 				_('A message from a non-valid JID arrived, it has been ignored.')))
+			return
 
 		addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS)
 
@@ -2133,6 +1619,11 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 			# so don't store it in logs
 			try:
 				gajim.logger.write('gc_msg', frm, msgtxt, tim=tim)
+				# store in memory time of last message logged.
+				# this will also be saved in rooms_last_message_time table 
+				# when we quit this muc
+				self.last_history_time[jid] = mktime(tim)
+
 			except exceptions.PysqliteOperationalError, e:
 				self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
 			except exceptions.DatabaseMalformed:
@@ -2159,47 +1650,12 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		self.dispatch('GC_INVITATION',(frm, jid_from, reason, password,
 			is_continued))
 
-	def _pubsubEventCB(self, con, msg):
-		''' Called when we receive <message/> with pubsub event. '''
-		# TODO: Logging? (actually services where logging would be useful, should
-		# TODO: allow to access archives remotely...)
-		jid = helpers.get_full_jid_from_iq(msg)
-		event = msg.getTag('event')
-
-		# XEP-0107: User Mood
-		items = event.getTag('items', {'node': common.xmpp.NS_MOOD})
-		if items: pep.user_mood(items, self.name, jid)
-		# XEP-0118: User Tune
-		items = event.getTag('items', {'node': common.xmpp.NS_TUNE})
-		if items: pep.user_tune(items, self.name, jid)
-		# XEP-0080: User Geolocation
-		items = event.getTag('items', {'node': common.xmpp.NS_GEOLOC})
-		if items: pep.user_geoloc(items, self.name, jid)
-		# XEP-0108: User Activity
-		items = event.getTag('items', {'node': common.xmpp.NS_ACTIVITY})
-		if items: pep.user_activity(items, self.name, jid)
-		# XEP-0172: User Nickname
-		items = event.getTag('items', {'node': common.xmpp.NS_NICK})
-		if items: pep.user_nickname(items, self.name, jid)
-
-		items = event.getTag('items')
-		if items is None: return
-
-		for item in items.getTags('item'):
-			entry = item.getTag('entry')
-			if entry is not None:
-				# for each entry in feed (there shouldn't be more than one,
-				# but to be sure...
-				self.dispatch('ATOM_ENTRY', (atom.OldEntry(node=entry),))
-				continue
-			# unknown type... probably user has another client who understands that event
-		raise common.xmpp.NodeProcessed
-
 	def _presenceCB(self, con, prs):
-		'''Called when we receive a presence'''
+		"""
+		Called when we receive a presence
+		"""
 		gajim.nec.push_incoming_event(NetworkEvent('raw-pres-received',
-												   conn = con,
-												   xmpp_pres = prs))
+			conn=con, xmpp_pres=prs))
 		ptype = prs.getType()
 		if ptype == 'available':
 			ptype = None
@@ -2301,7 +1757,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 
 				gc_control = gajim.interface.msg_win_mgr.get_gc_control(room_jid,
 						self.name)
-				
+
 				# If gc_control is missing - it may be minimized. Try to get it from
 				# there. If it's not there - then it's missing anyway and will
 				# remain set to None.
@@ -2407,6 +1863,11 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 
 		if ptype == 'subscribe':
 			log.debug('subscribe request from %s' % who)
+			if who.find('@') <= 0 and who in self.agent_registrations:
+				self.agent_registrations[who]['sub_received'] = True
+				if not self.agent_registrations[who]['roster_push']:
+					# We'll reply after roster push result
+					return
 			if gajim.config.get_per('accounts', self.name, 'autoauth') or \
 			who.find('@') <= 0 or jid_stripped in self.jids_for_auto_auth or \
 			transport_auto_auth:
@@ -2486,9 +1947,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 						# Anyway, it is the old behavior when we assumed that
 						# not-existing contacts don't support anything
 						contact_exists = bool(contact)
-						session_supported = contact_exists and \
-							contact.supports(common.xmpp.NS_SSN) or \
-							contact.supports(common.xmpp.NS_ESESSION)
+						session_supported = contact_exists and (
+							contact.supports(common.xmpp.NS_SSN) or
+							contact.supports(common.xmpp.NS_ESESSION))
 						if session_supported:
 							sess.terminate()
 							del self.sessions[jid][sess.thread_id]
@@ -2582,11 +2043,11 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		raise common.xmpp.NodeProcessed
 
 	def _PrivacySetCB(self, con, iq_obj):
-		'''
+		"""
 		Privacy lists (XEP 016)
 
-		A list has been set
-		'''
+		A list has been set.
+		"""
 		log.debug('PrivacySetCB')
 		if not self.connection or self.connected < 2:
 			return
@@ -2686,6 +2147,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		if show == 'invisible':
 			self.send_invisible_presence(msg, signed, True)
 			return
+		if show not in ['offline', 'online', 'chat', 'away', 'xa', 'dnd']:
+			return
 		priority = gajim.get_priority(self.name, sshow)
 		our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name))
 		vcard = self.get_cached_vcard(our_jid)
@@ -2765,6 +2228,11 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		con.RegisterHandler('message', self._messageCB)
 		con.RegisterHandler('presence', self._presenceCB)
 		con.RegisterHandler('presence', self._capsPresenceCB)
+		# We use makefirst so that this handler is called before _messageCB, and
+		# can prevent calling it when it's not needed.
+		# We also don't check for namespace, else it cannot stop _messageCB to be
+		# called
+		con.RegisterHandler('message', self._pubsubEventCB, makefirst=True)
 		con.RegisterHandler('iq', self._vCardCB, 'result',
 			common.xmpp.NS_VCARD)
 		con.RegisterHandler('iq', self._rosterSetCB, 'set',
diff --git a/src/common/contacts.py b/src/common/contacts.py
index 86175567f..439e5f5c0 100644
--- a/src/common/contacts.py
+++ b/src/common/contacts.py
@@ -28,31 +28,34 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
+
+from common import caps_cache
+from common.account import Account
 import common.gajim
-import caps
-from account import Account
 
 class XMPPEntity(object):
-	'''Base representation of entities in XMPP'''
-	
+	"""
+	Base representation of entities in XMPP
+	"""
+
 	def __init__(self, jid, account, resource):
 		self.jid = jid
 		self.resource = resource
 		self.account = account
 
 class CommonContact(XMPPEntity):
-	
-	def __init__(self, jid, account, resource, show, status, name, our_chatstate,
-	composing_xep, chatstate, client_caps=None):
-		
+
+	def __init__(self, jid, account, resource, show, status, name,
+			our_chatstate, composing_xep, chatstate, client_caps=None):
+
 		XMPPEntity.__init__(self, jid, account, resource)
-		
+
 		self.show = show
 		self.status = status
 		self.name = name
-		
-		self.client_caps = client_caps or caps.NullClientCaps()
-		
+
+		self.client_caps = client_caps or caps_cache.NullClientCaps()
+
 		# please read xep-85 http://www.xmpp.org/extensions/xep-0085.html
 		# we keep track of xep85 support with the peer by three extra states:
 		# None, False and 'ask'
@@ -67,18 +70,18 @@ class CommonContact(XMPPEntity):
 		self.composing_xep = composing_xep
 		# this is contact's chatstate
 		self.chatstate = chatstate
-	
+
 	def get_full_jid(self):
 		raise NotImplementedError
-	
+
 	def get_shown_name(self):
 		raise NotImplementedError
 
 	def supports(self, requested_feature):
-		'''
-		Returns True if the contact has advertised to support the feature
+		"""
+		Return True if the contact has advertised to support the feature
 		identified by the given namespace. False otherwise.
-		'''
+		"""
 		if self.show == 'offline':
 			# Unfortunately, if all resources are offline, the contact
 			# includes the last resource that was online. Check for its
@@ -86,33 +89,34 @@ class CommonContact(XMPPEntity):
 			# return caps for a contact that has no resources left.
 			return False
 		else:
-			return caps.client_supports(self.client_caps, requested_feature)
+			return caps_cache.client_supports(self.client_caps, requested_feature)
 
 
 class Contact(CommonContact):
-	'''Information concerning each contact'''
-	def __init__(self, jid, account, name='', groups=[], show='', status='', sub='',
-	ask='', resource='', priority=0, keyID='', client_caps=None,
-	our_chatstate=None, chatstate=None, last_status_time=None, msg_id = None,
-	composing_xep=None, mood={}, tune={}, activity={}):
-		
-		CommonContact.__init__(self, jid, account, resource, show, status, name, 
+	"""
+	Information concerning a contact
+	"""
+	def __init__(self, jid, account, name='', groups=[], show='', status='',
+			sub='', ask='', resource='', priority=0, keyID='', client_caps=None,
+			our_chatstate=None, chatstate=None, last_status_time=None, msg_id=
+			None, composing_xep=None, last_activity_time=None):
+
+		CommonContact.__init__(self, jid, account, resource, show, status, name,
 			our_chatstate, composing_xep, chatstate, client_caps=client_caps)
-		
+
 		self.contact_name = '' # nick choosen by contact
 		self.groups = [i for i in set(groups)] # filter duplicate values
 
 		self.sub = sub
 		self.ask = ask
-		
+
 		self.priority = priority
 		self.keyID = keyID
 		self.msg_id = msg_id
 		self.last_status_time = last_status_time
-		
-		self.mood = mood.copy()
-		self.tune = tune.copy()
-		self.activity = activity.copy()
+		self.last_activity_time = last_activity_time
+
+		self.pep = {}
 
 	def get_full_jid(self):
 		if self.resource:
@@ -139,7 +143,9 @@ class Contact(CommonContact):
 			return self.groups
 
 	def is_hidden_from_roster(self):
-		'''if contact should not be visible in roster'''
+		"""
+		If contact should not be visible in roster
+		"""
 		# XEP-0162: http://www.xmpp.org/extensions/xep-0162.html
 		if self.is_transport():
 			return False
@@ -169,54 +175,68 @@ class Contact(CommonContact):
 
 	def is_transport(self):
 		# if not '@' or '@' starts the jid then contact is transport
-		if self.jid.find('@') <= 0:
-			return True
-		return False
+		return self.jid.find('@') <= 0
 
 
 class GC_Contact(CommonContact):
-	'''Information concerning each groupchat contact'''
+	"""
+	Information concerning each groupchat contact
+	"""
+
 	def __init__(self, room_jid, account, name='', show='', status='', role='',
-	affiliation='', jid='', resource='', our_chatstate=None,
-	composing_xep=None, chatstate=None):
-		
+			affiliation='', jid='', resource='', our_chatstate=None,
+			composing_xep=None, chatstate=None):
+
 		CommonContact.__init__(self, jid, account, resource, show, status, name,
 				our_chatstate, composing_xep, chatstate)
-		
+
 		self.room_jid = room_jid
 		self.role = role
 		self.affiliation = affiliation
-		
+
 	def get_full_jid(self):
 		return self.room_jid + '/' + self.name
 
 	def get_shown_name(self):
 		return self.name
-	
+
 	def as_contact(self):
-		'''Create a Contact instance from this GC_Contact instance'''
+		"""
+		Create a Contact instance from this GC_Contact instance
+		"""
 		return Contact(jid=self.get_full_jid(), account=self.account,
-			resource=self.resource, name=self.name, groups=[], show=self.show,
-			status=self.status, sub='none', client_caps=self.client_caps)
-	
+			name=self.name, groups=[], show=self.show, status=self.status,
+			sub='none', client_caps=self.client_caps)
 
-class Contacts:
-	'''Information concerning all contacts and groupchat contacts'''
-	def __init__(self):
+
+class LegacyContactsAPI:
+	"""
+	This is a GOD class for accessing contact and groupchat information.
+	The API has several flaws:
 		
+		* it mixes concerns because it deals with contacts, groupchats,
+		  groupchat contacts and metacontacts
+		* some methods like get_contact() may return None. This leads to 
+		  a lot of duplication all over Gajim because it is not sure
+		  if we receive a proper contact or just None.
+		  
+	It is a long way to cleanup this API. Therefore just stick with it
+	and use it as before. We will try to figure out a migration path.
+	"""
+	def __init__(self):
 		self._metacontact_manager = MetacontactManager(self)
 		self._accounts = {}
-		
-	def change_account_name(self, old_name, new_name):		
+
+	def change_account_name(self, old_name, new_name):
 		self._accounts[new_name] = self._accounts[old_name]
 		self._accounts[new_name].name = new_name
 		del self._accounts[old_name]
-		
+
 		self._metacontact_manager.change_account_name(old_name, new_name)
 
 	def add_account(self, account_name):
-		self._accounts[account_name] = Account(account_name,
-				Contacts_New(), GC_Contacts())
+		self._accounts[account_name] = Account(account_name, Contacts(),
+			GC_Contacts())
 		self._metacontact_manager.add_account(account_name)
 
 	def get_accounts(self):
@@ -226,27 +246,31 @@ class Contacts:
 		del self._accounts[account]
 		self._metacontact_manager.remove_account(account)
 
-	def create_contact(self, jid, account, name='', groups=[], show='', status='',
-		sub='', ask='', resource='', priority=0, keyID='', client_caps=None,
-		our_chatstate=None, chatstate=None, last_status_time=None,
-		composing_xep=None, mood={}, tune={}, activity={}):
-		account = self._accounts.get(account, account) # Use Account object if available
+	def create_contact(self, jid, account, name='', groups=[], show='',
+	status='', sub='', ask='', resource='', priority=0, keyID='',
+	client_caps=None, our_chatstate=None, chatstate=None, last_status_time=None,
+	composing_xep=None, last_activity_time=None):
+		# Use Account object if available
+		account = self._accounts.get(account, account)
 		return Contact(jid=jid, account=account, name=name, groups=groups,
-			show=show, status=status, sub=sub, ask=ask, resource=resource, priority=priority,
-			keyID=keyID, client_caps=client_caps, our_chatstate=our_chatstate,
-			chatstate=chatstate, last_status_time=last_status_time,
-			composing_xep=composing_xep, mood=mood, tune=tune, activity=activity)
-		
-	def create_self_contact(self, jid, account, resource, show, status, priority, keyID=''):
+			show=show, status=status, sub=sub, ask=ask, resource=resource,
+			priority=priority, keyID=keyID, client_caps=client_caps,
+			our_chatstate=our_chatstate, chatstate=chatstate,
+			last_status_time=last_status_time, composing_xep=composing_xep,
+			last_activity_time=last_activity_time)
+
+	def create_self_contact(self, jid, account, resource, show, status, priority,
+	name='', keyID=''):
 		conn = common.gajim.connections[account]
-		nick = common.gajim.nicks[account]
+		nick = name or common.gajim.nicks[account]
 		account = self._accounts.get(account, account) # Use Account object if available
-		return self.create_contact(jid=jid, account=account,
+		self_contact = self.create_contact(jid=jid, account=account,
 			name=nick, groups=['self_contact'], show=show, status=status,
-			sub='both', ask='none',	priority=priority, keyID=keyID,
-			resource=resource, mood=conn.mood, tune=conn.tune,
-			activity=conn.activity)
-		
+			sub='both', ask='none', 	priority=priority, keyID=keyID,
+			resource=resource)
+		self_contact.pep = conn.pep
+		return self_contact
+
 	def create_not_in_roster_contact(self, jid, account, resource='', name='', keyID=''):
 		account = self._accounts.get(account, account) # Use Account object if available
 		return self.create_contact(jid=jid, account=account, resource=resource,
@@ -254,12 +278,15 @@ class Contacts:
 				status='', sub='none', keyID=keyID)
 
 	def copy_contact(self, contact):
-		return self.create_contact(jid=contact.jid, account=contact.account,
-			name=contact.name, groups=contact.groups, show=contact.show, status=contact.status,
-			sub=contact.sub, ask=contact.ask, resource=contact.resource,
-			priority=contact.priority, keyID=contact.keyID,
-			client_caps=contact.client_caps, our_chatstate=contact.our_chatstate,
-			chatstate=contact.chatstate, last_status_time=contact.last_status_time)
+		return self.create_contact(contact.jid, contact.account,
+			name=contact.name, groups=contact.groups, show=contact.show,
+			status=contact.status, sub=contact.sub, ask=contact.ask,
+			resource=contact.resource, priority=contact.priority,
+			keyID=contact.keyID, client_caps=contact.client_caps,
+			our_chatstate=contact.our_chatstate, chatstate=contact.chatstate,
+			last_status_time=contact.last_status_time,
+			composing_xep=contact.composing_xep,
+			last_activity_time=contact.last_activity_time)
 
 	def add_contact(self, account, contact):
 		if account not in self._accounts:
@@ -275,7 +302,7 @@ class Contacts:
 		self._accounts[account].contacts.remove_jid(jid)
 		if remove_meta:
 			self._metacontact_manager.remove_metacontact(account, jid)
-		
+
 	def get_contacts(self, account, jid):
 		return self._accounts[account].contacts.get_contacts(jid)
 
@@ -288,13 +315,13 @@ class Contacts:
 
 	def get_contact_from_full_jid(self, account, fjid):
 		return self._accounts[account].contacts.get_contact_from_full_jid(fjid)
-	
+
 	def get_first_contact_from_jid(self, account, jid):
 		return self._accounts[account].contacts.get_first_contact_from_jid(jid)
 
 	def get_contacts_from_group(self, account, group):
 		return self._accounts[account].contacts.get_contacts_from_group(group)
-	
+
 	def get_jid_list(self, account):
 		return self._accounts[account].contacts.get_jid_list()
 
@@ -318,10 +345,11 @@ class Contacts:
 			contact = self.get_gc_contact(account, room, nick)
 			return contact
 		return self.get_highest_prio_contact_from_contacts(contacts)
-	
+
 	def get_nb_online_total_contacts(self, accounts=[], groups=[]):
-		'''Returns the number of online contacts and the total number of
-		contacts'''
+		"""
+		Return the number of online contacts and the total number of contacts
+		"""
 		if accounts == []:
 			accounts = self.get_accounts()
 		nbr_online = 0
@@ -357,25 +385,13 @@ class Contacts:
 					nbr_total += 1
 		return nbr_online, nbr_total
 
-	def is_pm_from_jid(self, account, jid):
-		'''Returns True if the given jid is a private message jid'''
-		if jid in self._contacts[account]:
-			return False
-		return True
-
-	def is_pm_from_contact(self, account, contact):
-		'''Returns True if the given contact is a private message contact'''
-		if isinstance(contact, Contact):
-			return False
-		return True
-	
 	def __getattr__(self, attr_name):
 		# Only called if self has no attr_name
 		if hasattr(self._metacontact_manager, attr_name):
 			return getattr(self._metacontact_manager, attr_name)
 		else:
 			raise AttributeError(attr_name)
-	
+
 	def create_gc_contact(self, room_jid, account, name='', show='', status='',
 		role='', affiliation='', jid='', resource=''):
 		account = self._accounts.get(account, account) # Use Account object if available
@@ -402,15 +418,18 @@ class Contacts:
 
 	def get_nb_role_total_gc_contacts(self, account, room_jid, role):
 		return self._accounts[account].gc_contacts.get_nb_role_total_gc_contacts(room_jid, role)
-		
-		
-class Contacts_New():
-	
+
+
+class Contacts():
+	"""
+	This is a breakout of the contact related behavior of the old 
+	Contacts class (which is not called LegacyContactsAPI)
+	"""
 	def __init__(self):
 		# list of contacts  {jid1: [C1, C2]}, } one Contact per resource
 		self._contacts = {}
-		
-	def add_contact(self, contact):		
+
+	def add_contact(self, contact):
 		if contact.jid not in self._contacts:
 			self._contacts[contact.jid] = [contact]
 			return
@@ -426,7 +445,7 @@ class Contacts_New():
 				self.remove_contact(c)
 				break
 		contacts.append(contact)
-		
+
 	def remove_contact(self, contact):
 		if contact.jid not in self._contacts:
 			return
@@ -434,56 +453,60 @@ class Contacts_New():
 			self._contacts[contact.jid].remove(contact)
 		if len(self._contacts[contact.jid]) == 0:
 			del self._contacts[contact.jid]
-			
+
 	def remove_jid(self, jid):
-		'''Removes all contacts for a given jid'''
-		if jid not in self._contacts:
-			return
-		del self._contacts[jid]
-			
-	def get_contacts(self, jid):
-		'''Returns the list of contact instances for this jid.'''
+		"""
+		Remove all contacts for a given jid
+		"""
 		if jid in self._contacts:
-			return self._contacts[jid]
-		else:
-			return []
-		
+			del self._contacts[jid]
+
+	def get_contacts(self, jid):
+		"""
+		Return the list of contact instances for this jid
+		"""
+		return self._contacts.get(jid, [])
+
 	def get_contact(self, jid, resource=None):
 		### WARNING ###
 		# This function returns a *RANDOM* resource if resource = None!
 		# Do *NOT* use if you need to get the contact to which you
 		# send a message for example, as a bare JID in Jabber means
 		# highest available resource, which this function ignores!
-		'''Returns the contact instance for the given resource if it's given else
-		the first contact is no resource is given or None if there is not'''
+		"""
+		Return the contact instance for the given resource if it's given else the
+		first contact is no resource is given or None if there is not
+		"""
 		if jid in self._contacts:
 			if not resource:
 				return self._contacts[jid][0]
 			for c in self._contacts[jid]:
 				if c.resource == resource:
 					return c
-		return None
 
 	def iter_contacts(self):
 		for jid in self._contacts.keys():
 			for contact in self._contacts[jid][:]:
 				yield contact
-				
+
 	def get_jid_list(self):
 		return self._contacts.keys()
-				
+
 	def get_contact_from_full_jid(self, fjid):
-		''' Get Contact object for specific resource of given jid'''
+		"""
+		Get Contact object for specific resource of given jid
+		"""
 		barejid, resource = common.gajim.get_room_and_nick_from_fjid(fjid)
 		return self.get_contact(barejid, resource)
-	
+
 	def get_first_contact_from_jid(self, jid):
 		if jid in self._contacts:
 			return self._contacts[jid][0]
-		return None
 
 	def get_contacts_from_group(self, group):
-		'''Returns all contacts in the given group'''
+		"""
+		Return all contacts in the given group
+		"""
 		group_contacts = []
 		for jid in self._contacts:
 			contacts = self.get_contacts(jid)
@@ -502,11 +525,11 @@ class Contacts_New():
 
 
 class GC_Contacts():
-	
+
 	def __init__(self):
 		# list of contacts that are in gc {room_jid: {nick: C}}}
 		self._rooms = {}
-	
+
 	def add_gc_contact(self, gc_contact):
 		if gc_contact.room_jid not in self._rooms:
 			self._rooms[gc_contact.room_jid] = {gc_contact.name: gc_contact}
@@ -524,9 +547,8 @@ class GC_Contacts():
 			del self._rooms[gc_contact.room_jid]
 
 	def remove_room(self, room_jid):
-		if room_jid not in self._rooms:
-			return
-		del self._rooms[room_jid]
+		if room_jid in self._rooms:
+			del self._rooms[room_jid]
 
 	def get_gc_list(self):
 		return self._rooms.keys()
@@ -544,8 +566,10 @@ class GC_Contacts():
 		return self._rooms[room_jid][nick]
 
 	def get_nb_role_total_gc_contacts(self, room_jid, role):
-		'''Returns the number of group chat contacts for the given role and the
-		total number of group chat contacts'''
+		"""
+		Return the number of group chat contacts for the given role and the total
+		number of group chat contacts
+		"""
 		if room_jid not in self._rooms:
 			return 0, 0
 		nb_role = nb_total = 0
@@ -554,25 +578,25 @@ class GC_Contacts():
 				nb_role += 1
 			nb_total += 1
 		return nb_role, nb_total
-		
+
 
 class MetacontactManager():
-	
+
 	def __init__(self, contacts):
 		self._metacontacts_tags = {}
 		self._contacts = contacts
-	
+
 	def change_account_name(self, old_name, new_name):
 		self._metacontacts_tags[new_name] = self._metacontacts_tags[old_name]
 		del self._metacontacts_tags[old_name]
-		
+
 	def add_account(self, account):
 		if account not in self._metacontacts_tags:
 			self._metacontacts_tags[account] = {}
-	
+
 	def remove_account(self, account):
 		del self._metacontacts_tags[account]
-		
+
 	def define_metacontacts(self, account, tags_list):
 		self._metacontacts_tags[account] = tags_list
 
@@ -582,13 +606,15 @@ class MetacontactManager():
 		#FIXME: can this append ?
 		assert False
 
-	def iter_metacontacts_families(self, account):		
+	def iter_metacontacts_families(self, account):
 		for tag in self._metacontacts_tags[account]:
 			family = self._get_metacontacts_family_from_tag(account, tag)
 			yield family
 
 	def _get_metacontacts_tag(self, account, jid):
-		'''Returns the tag of a jid'''
+		"""
+		Return the tag of a jid
+		"""
 		if not account in self._metacontacts_tags:
 			return None
 		for tag in self._metacontacts_tags[account]:
@@ -625,8 +651,8 @@ class MetacontactManager():
 
 	def remove_metacontact(self, account, jid):
 		if not account in self._metacontacts_tags:
-			return None
-		
+			return
+
 		found = None
 		for tag in self._metacontacts_tags[account]:
 			for data in self._metacontacts_tags[account][tag]:
@@ -657,7 +683,9 @@ class MetacontactManager():
 		return False
 
 	def _get_metacontacts_jids(self, tag, accounts):
-		'''Returns all jid for the given tag in the form {acct: [jid1, jid2],.}'''
+		"""
+		Return all jid for the given tag in the form {acct: [jid1, jid2],.}
+		"""
 		answers = {}
 		for account in self._metacontacts_tags:
 			if tag in self._metacontacts_tags[account]:
@@ -669,9 +697,10 @@ class MetacontactManager():
 		return answers
 
 	def get_metacontacts_family(self, account, jid):
-		'''return the family of the given jid, including jid in the form:
-		[{'account': acct, 'jid': jid, 'order': order}, ]
-		'order' is optional'''
+		"""
+		Return the family of the given jid, including jid in the form:
+		[{'account': acct, 'jid': jid, 'order': order}, ] 'order' is optional
+		"""
 		tag = self._get_metacontacts_tag(account, jid)
 		return self._get_metacontacts_family_from_tag(account, tag)
 
@@ -687,9 +716,12 @@ class MetacontactManager():
 		return answers
 
 	def _compare_metacontacts(self, data1, data2):
-		'''compare 2 metacontacts.
-		Data is {'jid': jid, 'account': account, 'order': order}
-		order is optional'''
+		"""
+		Compare 2 metacontacts
+
+		Data is {'jid': jid, 'account': account, 'order': order} order is
+		optional
+		"""
 		jid1 = data1['jid']
 		jid2 = data2['jid']
 		account1 = data1['account']
@@ -765,16 +797,17 @@ class MetacontactManager():
 		if account2 > account1:
 			return -1
 		return 0
-	
+
 	def get_nearby_family_and_big_brother(self, family, account):
-		'''Return the nearby family and its Big Brother
+		"""
+		Return the nearby family and its Big Brother
 
-		Nearby family is the part of the family that is grouped with the metacontact.
-		A metacontact may be over different accounts. If accounts are not merged
-		then the given family is split account wise.
+		Nearby family is the part of the family that is grouped with the
+		metacontact.  A metacontact may be over different accounts. If accounts
+		are not merged then the given family is split account wise.
 
 		(nearby_family, big_brother_jid, big_brother_account)
-		'''
+		"""
 		if common.gajim.config.get('mergeaccounts'):
 			# group all together
 			nearby_family = family
@@ -789,9 +822,11 @@ class MetacontactManager():
 		return (nearby_family, big_brother_jid, big_brother_account)
 
 	def _get_metacontacts_big_brother(self, family):
-		'''which of the family will be the big brother under wich all
-		others will be ?'''
+		"""
+		Which of the family will be the big brother under wich all others will be
+		?
+		"""
 		family.sort(cmp=self._compare_metacontacts)
 		return family[-1]
-	
+
 # vim: se ts=3:
diff --git a/src/common/dataforms.py b/src/common/dataforms.py
index bd9c3e15f..048077a74 100644
--- a/src/common/dataforms.py
+++ b/src/common/dataforms.py
@@ -21,8 +21,10 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-""" This module contains wrappers for different parts of data forms (JEP 0004).
-For information how to use them, read documentation. """
+"""
+This module contains wrappers for different parts of data forms (JEP 0004). For
+information how to use them, read documentation
+"""
 
 import xmpp
 
@@ -72,7 +74,9 @@ def Field(typ, **attrs):
 	return f
 
 def ExtendField(node):
-	''' Helper function to extend a node to field of appropriate type. '''
+	"""
+	Helper function to extend a node to field of appropriate type
+	"""
 	# when validation (XEP-122) will go in, we could have another classes
 	# like DateTimeField - so that dicts in Field() and ExtendField() will
 	# be different...
@@ -94,19 +98,23 @@ def ExtendField(node):
 	return f[typ](extend=node)
 
 def ExtendForm(node):
-	''' Helper function to extend a node to form of appropriate type. '''
+	"""
+	Helper function to extend a node to form of appropriate type
+	"""
 	if node.getTag('reported') is not None:
 		return MultipleDataForm(extend=node)
 	else:
 		return SimpleDataForm(extend=node)
 
 class DataField(ExtendedNode):
-	""" Keeps data about one field - var, field type, labels, instructions...
-	Base class for different kinds of fields. Use Field() function to
-	construct one of these. """
+	"""
+	Keeps data about one field - var, field type, labels, instructions... Base
+	class for different kinds of fields. Use Field() function to construct one
+	of these
+	"""
 
 	def __init__(self, typ=None, var=None, value=None, label=None, desc=None,
-	required=False, options=None, extend=None):
+			required=False, options=None, extend=None):
 
 		if extend is None:
 			ExtendedNode.__init__(self, 'field')
@@ -124,10 +132,12 @@ class DataField(ExtendedNode):
 
 	@nested_property
 	def type():
-		'''Type of field. Recognized values are: 'boolean', 'fixed', 'hidden',
+		"""
+		Type of field. Recognized values are: 'boolean', 'fixed', 'hidden',
 		'jid-multi', 'jid-single', 'list-multi', 'list-single', 'text-multi',
 		'text-private', 'text-single'. If you set this to something different,
-		DataField will store given name, but treat all data as text-single.'''
+		DataField will store given name, but treat all data as text-single
+		"""
 		def fget(self):
 			t = self.getAttr('type')
 			if t is None:
@@ -142,7 +152,9 @@ class DataField(ExtendedNode):
 
 	@nested_property
 	def var():
-		'''Field identifier.'''
+		"""
+		Field identifier
+		"""
 		def fget(self):
 			return self.getAttr('var')
 
@@ -157,7 +169,9 @@ class DataField(ExtendedNode):
 
 	@nested_property
 	def label():
-		'''Human-readable field name.'''
+		"""
+		Human-readable field name
+		"""
 		def fget(self):
 			l = self.getAttr('label')
 			if not l:
@@ -176,7 +190,9 @@ class DataField(ExtendedNode):
 
 	@nested_property
 	def description():
-		'''Human-readable description of field meaning.'''
+		"""
+		Human-readable description of field meaning
+		"""
 		def fget(self):
 			return self.getTagData('desc') or u''
 
@@ -196,7 +212,9 @@ class DataField(ExtendedNode):
 
 	@nested_property
 	def required():
-		'''Controls whether this field required to fill. Boolean.'''
+		"""
+		Controls whether this field required to fill. Boolean
+		"""
 		def fget(self):
 			return bool(self.getTag('required'))
 
@@ -212,7 +230,9 @@ class DataField(ExtendedNode):
 class BooleanField(DataField):
 	@nested_property
 	def value():
-		'''Value of field. May contain True, False or None.'''
+		"""
+		Value of field. May contain True, False or None
+		"""
 		def fget(self):
 			v = self.getTagData('value')
 			if v in ('0', 'false'):
@@ -234,10 +254,15 @@ class BooleanField(DataField):
 		return locals()
 
 class StringField(DataField):
-	''' Covers fields of types: fixed, hidden, text-private, text-single. '''
+	"""
+	Covers fields of types: fixed, hidden, text-private, text-single
+	"""
+
 	@nested_property
 	def value():
-		'''Value of field. May be any unicode string.'''
+		"""
+		Value of field. May be any unicode string
+		"""
 		def fget(self):
 			return self.getTagData('value') or u''
 
@@ -256,10 +281,15 @@ class StringField(DataField):
 		return locals()
 
 class ListField(DataField):
-	'''Covers fields of types: jid-multi, jid-single, list-multi, list-single.'''
+	"""
+	Covers fields of types: jid-multi, jid-single, list-multi, list-single
+	"""
+
 	@nested_property
 	def options():
-		'''Options.'''
+		"""
+		Options
+		"""
 		def fget(self):
 			options = []
 			for element in self.getTags('option'):
@@ -294,14 +324,21 @@ class ListField(DataField):
 			yield (v, l)
 
 class ListSingleField(ListField, StringField):
-	'''Covers list-single and jid-single fields.'''
+	"""
+	Covers list-single and jid-single fields
+	"""
 	pass
 
 class ListMultiField(ListField):
-	'''Covers list-multi and jid-multi fields.'''
+	"""
+	Covers list-multi and jid-multi fields
+	"""
+
 	@nested_property
 	def values():
-		'''Values held in field.'''
+		"""
+		Values held in field
+		"""
 		def fget(self):
 			values = []
 			for element in self.getTags('value'):
@@ -326,7 +363,9 @@ class ListMultiField(ListField):
 class TextMultiField(DataField):
 	@nested_property
 	def value():
-		'''Value held in field.'''
+		"""
+		Value held in field
+		"""
 		def fget(self):
 			value = u''
 			for element in self.iterTags('value'):
@@ -347,8 +386,10 @@ class TextMultiField(DataField):
 		return locals()
 
 class DataRecord(ExtendedNode):
-	'''The container for data fields - an xml element which has DataField
-	elements as children.'''
+	"""
+	The container for data fields - an xml element which has DataField elements
+	as children
+	"""
 	def __init__(self, fields=None, associated=None, extend=None):
 		self.associated = associated
 		self.vars = {}
@@ -373,7 +414,9 @@ class DataRecord(ExtendedNode):
 
 	@nested_property
 	def fields():
-		'''List of fields in this record.'''
+		"""
+		List of fields in this record
+		"""
 		def fget(self):
 			return self.getTags('field')
 
@@ -391,14 +434,17 @@ class DataRecord(ExtendedNode):
 		return locals()
 
 	def iter_fields(self):
-		''' Iterate over fields in this record. Do not take associated
-		into account. '''
+		"""
+		Iterate over fields in this record. Do not take associated into account
+		"""
 		for field in self.iterTags('field'):
 			yield field
 
 	def iter_with_associated(self):
-		''' Iterate over associated, yielding both our field and
-		associated one together. '''
+		"""
+		Iterate over associated, yielding both our field and associated one
+		together
+		"""
 		for field in self.associated.iter_fields():
 			yield self[field.var], field
 
@@ -420,9 +466,11 @@ class DataForm(ExtendedNode):
 
 	@nested_property
 	def type():
-		''' Type of the form. Must be one of: 'form', 'submit', 'cancel', 'result'.
+		"""
+		Type of the form. Must be one of: 'form', 'submit', 'cancel', 'result'.
 		'form' - this form is to be filled in; you will be able soon to do:
-			filledform = DataForm(replyto=thisform)...'''
+		filledform = DataForm(replyto=thisform)
+		"""
 		def fget(self):
 			return self.getAttr('type')
 
@@ -434,7 +482,11 @@ class DataForm(ExtendedNode):
 
 	@nested_property
 	def title():
-		''' Title of the form. Human-readable, should not contain any \\r\\n.'''
+		"""
+		Title of the form
+
+		Human-readable, should not contain any \\r\\n.
+		"""
 		def fget(self):
 			return self.getTagData('title')
 
@@ -451,7 +503,11 @@ class DataForm(ExtendedNode):
 
 	@nested_property
 	def instructions():
-		''' Instructions for this form. Human-readable, may contain \\r\\n. '''
+		"""
+		Instructions for this form
+
+		Human-readable, may contain \\r\\n.
+		"""
 		# TODO: the same code is in TextMultiField. join them
 		def fget(self):
 			value = u''
@@ -520,7 +576,9 @@ class MultipleDataForm(DataForm):
 
 	@nested_property
 	def items():
-		''' A list of all records. '''
+		"""
+		A list of all records
+		"""
 		def fget(self):
 			return list(self.iter_records())
 
@@ -543,7 +601,9 @@ class MultipleDataForm(DataForm):
 
 #	@nested_property
 #	def reported():
-#		''' DataRecord that contains descriptions of fields in records.'''
+#		"""
+#		DataRecord that contains descriptions of fields in records
+#		"""
 #		def fget(self):
 #			return self.getTag('reported')
 #		def fset(self, record):
diff --git a/src/common/dbus_support.py b/src/common/dbus_support.py
index ae2016603..4762b474d 100644
--- a/src/common/dbus_support.py
+++ b/src/common/dbus_support.py
@@ -51,7 +51,10 @@ else:
 			print _('D-Bus capabilities of Gajim cannot be used')
 
 class SystemBus:
-	'''A Singleton for the DBus SystemBus'''
+	"""
+	A Singleton for the DBus SystemBus
+	"""
+
 	def __init__(self):
 		self.system_bus = None
 
@@ -60,7 +63,7 @@ class SystemBus:
 			raise exceptions.DbusNotSupported
 
 		if not self.present():
-				raise exceptions.SystemBusNotPresent
+			raise exceptions.SystemBusNotPresent
 		return self.system_bus
 
 	def bus(self):
@@ -84,7 +87,10 @@ class SystemBus:
 system_bus = SystemBus()
 
 class SessionBus:
-	'''A Singleton for the D-Bus SessionBus'''
+	"""
+	A Singleton for the D-Bus SessionBus
+	"""
+
 	def __init__(self):
 		self.session_bus = None
 
@@ -115,8 +121,10 @@ class SessionBus:
 session_bus = SessionBus()
 
 def get_interface(interface, path, start_service=True):
-	'''Returns an interface on the current SessionBus. If the interface isn\'t
-	running, it tries to start it first.'''
+	"""
+	Get an interface on the current SessionBus. If the interface isn't running,
+	try to start it first
+	"""
 	if not supported:
 		return None
 	if session_bus.present():
@@ -144,9 +152,11 @@ def get_interface(interface, path, start_service=True):
 
 
 def get_notifications_interface(notif=None):
-	'''Returns the notifications interface.
+	"""
+	Get the notifications interface
 
-	:param notif: DesktopNotification instance'''
+	:param notif: DesktopNotification instance
+	"""
 	# try to see if KDE notifications are available
 	iface = get_interface('org.kde.VisualNotifications', '/VisualNotifications',
 		start_service=False)
diff --git a/src/common/defs.py b/src/common/defs.py
index 6640c3b32..11a8d23a6 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -24,10 +24,10 @@
 ##
 
 docdir = '../'
-datadir = '../'
+basedir   = '../'
 localedir = '../po'
 
-version = '0.13.0.1-dev'
+version = '0.13.10.1-dev'
 
 import sys, os.path
 for base in ('.', 'common'):
diff --git a/src/common/dh.py b/src/common/dh.py
index 4b038ea93..b13cdefc0 100644
--- a/src/common/dh.py
+++ b/src/common/dh.py
@@ -19,12 +19,13 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-'''
+"""
 This module defines a number of constants; specifically, large primes suitable
-for use with the Diffie-Hellman key exchange.
+for use with the Diffie-Hellman key exchange
 
 These constants have been obtained from RFC2409 and RFC3526.
-'''
+"""
+
 import string
 
 generators = [	None, # one to get the right offset
diff --git a/src/common/events.py b/src/common/events.py
index 4e5068652..ccf5744f1 100644
--- a/src/common/events.py
+++ b/src/common/events.py
@@ -27,13 +27,18 @@
 import time
 
 class Event:
-	'''Information concerning each event'''
+	"""
+	Information concerning each event
+	"""
+
 	def __init__(self, type_, time_, parameters, show_in_roster=False,
-	show_in_systray=True):
-		''' type_ in chat, normal, file-request, file-error, file-completed,
+			show_in_systray=True):
+		"""
+		type_ in chat, normal, file-request, file-error, file-completed,
 		file-request-error, file-send-error, file-stopped, gc_msg, pm,
 		printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm,
 		gc-invitation, subscription_request, unsubscribedm jingle-incoming
+
 		parameters is (per type_):
 			chat, normal, pm: [message, subject, kind, time, encrypted, resource,
 			msg_id]
@@ -47,7 +52,7 @@ class Event:
 			subscription_request: [text, nick]
 			unsubscribed: contact
 			jingle-incoming: (fulljid, sessionid, content_types)
-		'''
+		"""
 		self.type_ = type_
 		self.time_ = time_
 		self.parameters = parameters
@@ -58,29 +63,40 @@ class Event:
 		self.account = None
 
 class Events:
-	'''Information concerning all events'''
+	"""
+	Information concerning all events
+	"""
+
 	def __init__(self):
 		self._events = {} # list of events {acct: {jid1: [E1, E2]}, }
 		self._event_added_listeners = []
 		self._event_removed_listeners = []
 
 	def event_added_subscribe(self, listener):
-		'''Add a listener when an event is added to the queue'''
+		"""
+		Add a listener when an event is added to the queue
+		"""
 		if not listener in self._event_added_listeners:
 			self._event_added_listeners.append(listener)
 
 	def event_added_unsubscribe(self, listener):
-		'''Remove a listener when an event is added to the queue'''
+		"""
+		Remove a listener when an event is added to the queue
+		"""
 		if listener in self._event_added_listeners:
 			self._event_added_listeners.remove(listener)
 
 	def event_removed_subscribe(self, listener):
-		'''Add a listener when an event is removed from the queue'''
+		"""
+		Add a listener when an event is removed from the queue
+		"""
 		if not listener in self._event_removed_listeners:
 			self._event_removed_listeners.append(listener)
 
 	def event_removed_unsubscribe(self, listener):
-		'''Remove a listener when an event is removed from the queue'''
+		"""
+		Remove a listener when an event is removed from the queue
+		"""
 		if listener in self._event_removed_listeners:
 			self._event_removed_listeners.remove(listener)
 
@@ -125,9 +141,10 @@ class Events:
 		self.fire_event_added(event)
 
 	def remove_events(self, account, jid, event = None, types = []):
-		'''if event is not specified, remove all events from this jid,
-		optionally only from given type
-		return True if no such event found'''
+		"""
+		If event is not specified, remove all events from this jid, optionally
+		only from given type return True if no such event found
+		"""
 		if account not in self._events:
 			return True
 		if jid not in self._events[account]:
@@ -177,10 +194,11 @@ class Events:
 		return self._get_nb_events(types = types, account = account)
 
 	def get_events(self, account, jid = None, types = []):
-		'''returns all events from the given account of the form
-		{jid1: [], jid2: []}
-		if jid is given, returns all events from the given jid in a list: []
-		optionally only from given type'''
+		"""
+		Return all events from the given account of the form {jid1: [], jid2:
+		[]}. If jid is given, returns all events from the given jid in a list: []
+		optionally only from given type
+		"""
 		if account not in self._events:
 			return []
 		if not jid:
@@ -202,7 +220,9 @@ class Events:
 		return events_list
 
 	def get_first_event(self, account, jid = None, type_ = None):
-		'''Return the first event of type type_ if given'''
+		"""
+		Return the first event of type type_ if given
+		"""
 		events_list = self.get_events(account, jid, type_)
 		# be sure it's bigger than latest event
 		first_event_time = time.time() + 1
@@ -213,9 +233,11 @@ class Events:
 				first_event = event
 		return first_event
 
-	def _get_nb_events(self, account = None, jid = None, attribute = None,
-		types = []):
-		'''return the number of pending events'''
+	def _get_nb_events(self, account = None, jid = None, attribute = None, types
+			= []):
+		"""
+		Return the number of pending events
+		"""
 		nb = 0
 		if account:
 			accounts = [account]
@@ -241,7 +263,9 @@ class Events:
 		return nb
 
 	def _get_some_events(self, attribute):
-		'''attribute in systray, roster'''
+		"""
+		Attribute in systray, roster
+		"""
 		events = {}
 		for account in self._events:
 			events[account] = {}
@@ -258,8 +282,11 @@ class Events:
 		return events
 
 	def _get_first_event_with_attribute(self, events):
-		'''get the first event
-		events is in the form {account1: {jid1: [ev1, ev2], },. }'''
+		"""
+		Get the first event
+
+		events is in the form {account1: {jid1: [ev1, ev2], },. }
+		"""
 		# be sure it's bigger than latest event
 		first_event_time = time.time() + 1
 		first_account = None
@@ -276,12 +303,16 @@ class Events:
 		return first_account, first_jid, first_event
 
 	def get_nb_systray_events(self, types = []):
-		'''returns the number of events displayed in roster'''
+		"""
+		Return the number of events displayed in roster
+		"""
 		return self._get_nb_events(attribute = 'systray', types = types)
 
 	def get_systray_events(self):
-		'''return all events that must be displayed in systray:
-		{account1: {jid1: [ev1, ev2], },. }'''
+		"""
+		Return all events that must be displayed in systray:
+			{account1: {jid1: [ev1, ev2], },. }
+		"""
 		return self._get_some_events('systray')
 
 	def get_first_systray_event(self):
@@ -289,13 +320,17 @@ class Events:
 		return self._get_first_event_with_attribute(events)
 
 	def get_nb_roster_events(self, account = None, jid = None, types = []):
-		'''returns the number of events displayed in roster'''
+		"""
+		Return the number of events displayed in roster
+		"""
 		return self._get_nb_events(attribute = 'roster', account = account,
 			jid = jid, types = types)
 
 	def get_roster_events(self):
-		'''return all events that must be displayed in roster:
-		{account1: {jid1: [ev1, ev2], },. }'''
+		"""
+		Return all events that must be displayed in roster:
+			{account1: {jid1: [ev1, ev2], },. }
+		"""
 		return self._get_some_events('roster')
 
 # vim: se ts=3:
diff --git a/src/common/exceptions.py b/src/common/exceptions.py
index 9f20e1d97..090255768 100644
--- a/src/common/exceptions.py
+++ b/src/common/exceptions.py
@@ -21,16 +21,11 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-class PysqliteNotAvailable(Exception):
-	'''sqlite2 is not installed or python bindings are missing'''
-	def __init__(self):
-		Exception.__init__(self)
-
-	def __str__(self):
-		return _('pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting...')
-
 class PysqliteOperationalError(Exception):
-	'''sqlite2 raised pysqlite2.dbapi2.OperationalError'''
+	"""
+	Sqlite2 raised pysqlite2.dbapi2.OperationalError
+	"""
+
 	def __init__(self, text=''):
 		Exception.__init__(self)
 		self.text = text
@@ -39,7 +34,10 @@ class PysqliteOperationalError(Exception):
 		return self.text
 
 class DatabaseMalformed(Exception):
-	'''The databas can't be read'''
+	"""
+	The databas can't be read
+	"""
+
 	def __init__(self):
 		Exception.__init__(self)
 
@@ -47,7 +45,10 @@ class DatabaseMalformed(Exception):
 		return _('Database cannot be read.')
 
 class ServiceNotAvailable(Exception):
-	'''This exception is raised when we cannot use Gajim remotely'''
+	"""
+	This exception is raised when we cannot use Gajim remotely'
+	"""
+
 	def __init__(self):
 		Exception.__init__(self)
 
@@ -55,7 +56,10 @@ class ServiceNotAvailable(Exception):
 		return _('Service not available: Gajim is not running, or remote_control is False')
 
 class DbusNotSupported(Exception):
-	'''D-Bus is not installed or python bindings are missing'''
+	"""
+	D-Bus is not installed or python bindings are missing
+	"""
+
 	def __init__(self):
 		Exception.__init__(self)
 
@@ -63,27 +67,52 @@ class DbusNotSupported(Exception):
 		return _('D-Bus is not present on this machine or python module is missing')
 
 class SessionBusNotPresent(Exception):
-	'''This exception indicates that there is no session daemon'''
+	"""
+	This exception indicates that there is no session daemon
+	"""
+
 	def __init__(self):
 		Exception.__init__(self)
 
 	def __str__(self):
-		return _('Session bus is not available.\nTry reading http://trac.gajim.org/wiki/GajimDBus')
+		return _('Session bus is not available.\nTry reading %(url)s') % \
+			{'url': 'http://trac.gajim.org/wiki/GajimDBus'}
+
+class SystemBusNotPresent(Exception):
+	"""
+	This exception indicates that there is no session daemon
+	"""
+
+	def __init__(self):
+		Exception.__init__(self)
+
+	def __str__(self):
+		return _('System bus is not available.\nTry reading %(url)s') % \
+			{'url': 'http://trac.gajim.org/wiki/GajimDBus'}
 
 class NegotiationError(Exception):
-	'''A session negotiation failed'''
+	"""
+	A session negotiation failed
+	"""
 	pass
 
 class DecryptionError(Exception):
-	'''A message couldn't be decrypted into usable XML'''
+	"""
+	A message couldn't be decrypted into usable XML
+	"""
 	pass
 
 class Cancelled(Exception):
-	'''The user cancelled an operation'''
+	"""
+	The user cancelled an operation
+	"""
 	pass
 
 class LatexError(Exception):
-	'''LaTeX processing failed for some reason'''
+	"""
+	LaTeX processing failed for some reason
+	"""
+
 	def __init__(self, text=''):
 		Exception.__init__(self)
 		self.text = text
@@ -92,7 +121,10 @@ class LatexError(Exception):
 		return self.text
 
 class GajimGeneralException(Exception):
-	'''This exception is our general exception'''
+	"""
+	This exception is our general exception
+	"""
+
 	def __init__(self, text=''):
 		Exception.__init__(self)
 		self.text = text
diff --git a/src/common/fuzzyclock.py b/src/common/fuzzyclock.py
index fc285fd8f..3adad66d1 100755
--- a/src/common/fuzzyclock.py
+++ b/src/common/fuzzyclock.py
@@ -21,7 +21,7 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-'''
+"""
 Python class to show a "fuzzy clock".
 Homepage of the original: http://home.gna.org/fuzzyclock/
 Project Page of the original: http://gna.org/projects/fuzzyclock
@@ -30,7 +30,7 @@ The class is based on a port from PHP code by
 Henrique Recidive <henrique at recidive.com> which was
 in turn based on the Fuzzy Clock Applet of Frerich Raabe (KDE).
 So most of the credit goes to this guys, thanks :-)
-'''
+"""
 
 import time
 
@@ -46,7 +46,7 @@ class FuzzyClock:
 		_('half past %(0)s'), _('twenty five to %(1)s'), _('twenty to %(1)s'),
 		_('quarter to %(1)s'), _('ten to %(1)s'), _('five to %(1)s'), _("%(1)s o'clock") ]
 
-	FUZZY_DAYTIME = [ _('Night'), _('Early morning'), _('Morning'), 
+	FUZZY_DAYTIME = [ _('Night'), _('Early morning'), _('Morning'),
 		_('Almost noon'), _('Noon'), _('Afternoon'), _('Evening'),
 		_('Late evening'), _('Night') ]
 
diff --git a/src/common/gajim.py b/src/common/gajim.py
index caf4c440e..59c9b40aa 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -86,9 +86,10 @@ MY_EMOTS_PATH = gajimpaths['MY_EMOTS']
 MY_ICONSETS_PATH = gajimpaths['MY_ICONSETS']
 MY_MOOD_ICONSETS_PATH = gajimpaths['MY_MOOD_ICONSETS']
 MY_ACTIVITY_ICONSETS_PATH = gajimpaths['MY_ACTIVITY_ICONSETS']
-MY_CACERTS =  gajimpaths['MY_CACERTS']
+MY_CACERTS = gajimpaths['MY_CACERTS']
 TMP = gajimpaths['TMP']
 DATA_DIR = gajimpaths['DATA']
+ICONS_DIR = gajimpaths['ICONS']
 HOME_DIR = gajimpaths['HOME']
 PLUGINS_DIRS = [gajimpaths['PLUGINS_BASE'],
 				gajimpaths['PLUGINS_USER']]
@@ -106,7 +107,7 @@ else:
 
 os_info = None # used to cache os information
 
-from contacts import Contacts
+from contacts import LegacyContactsAPI
 from events import Events
 
 gmail_domains = ['gmail.com', 'googlemail.com']
@@ -117,7 +118,7 @@ last_message_time = {} # list of time of the latest incomming message
 							# {acct1: {jid1: time1, jid2: time2}, }
 encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..}
 
-contacts = Contacts()
+contacts = LegacyContactsAPI()
 gc_connected = {} # tell if we are connected to the room or not {acct: {room_jid: True}}
 gc_passwords = {} # list of the pass required to enter a room {room_jid: password}
 automatic_rooms = {} # list of rooms that must be automaticaly configured and for which we have a list of invities {account: {room_jid: {'invities': []}}}
@@ -172,12 +173,6 @@ try:
 except ImportError:
 	HAVE_PYCRYPTO = False
 
-HAVE_PYSEXY = True
-try:
-	import sexy
-except ImportError:
-	HAVE_PYSEXY = False
-
 HAVE_GPG = True
 try:
 	import GnuPGInterface
@@ -188,8 +183,9 @@ else:
 	if system('gpg -h >/dev/null 2>&1'):
 		HAVE_GPG = False
 
-import latex
-HAVE_LATEX = latex.check_for_latex_support()
+# Depends on use_latex option. Will be correctly set after we config options are
+# read.
+HAVE_LATEX = False
 
 HAVE_INDICATOR = True
 try:
@@ -217,8 +213,8 @@ gajim_optional_features = {}
 # Capabilities hash per account
 caps_hash = {}
 
-import caps
-caps.initialize(logger)
+import caps_cache
+caps_cache.initialize(logger)
 
 def get_nick_from_jid(jid):
 	pos = jid.find('@')
@@ -228,11 +224,6 @@ def get_server_from_jid(jid):
 	pos = jid.find('@') + 1 # after @
 	return jid[pos:]
 
-def get_resource_from_jid(jid):
-    tokens = jid.split('/', 1)
-    if len(tokens) > 1:
-        return tokens[1]
-
 def get_name_and_server_from_jid(jid):
 	name = get_nick_from_jid(jid)
 	server = get_server_from_jid(jid)
@@ -248,8 +239,9 @@ def get_room_and_nick_from_fjid(jid):
 	return l
 
 def get_real_jid_from_fjid(account, fjid):
-	'''returns real jid or returns None
-	if we don't know the real jid'''
+	"""
+	Return real jid or returns None, if we don't know the real jid
+	"""
 	room_jid, nick = get_room_and_nick_from_fjid(fjid)
 	if not nick: # It's not a fake_jid, it is a real jid
 		return fjid # we return the real jid
@@ -274,7 +266,9 @@ def get_jid_without_resource(jid):
 	return jid.split('/')[0]
 
 def construct_fjid(room_jid, nick):
-	''' nick is in utf8 (taken from treeview); room_jid is in unicode'''
+	"""
+	Nick is in UTF-8 (taken from treeview); room_jid is in unicode
+	"""
 	# fake jid is the jid for a contact in a room
 	# gaim@conference.jabber.org/nick
 	if isinstance(nick, str):
@@ -288,19 +282,17 @@ def get_resource_from_jid(jid):
 	else:
 		return ''
 
-# [15:34:28] <asterix> we should add contact.fake_jid I think
-# [15:34:46] <asterix> so if we know real jid, it wil be in contact.jid, or we look in contact.fake_jid
-# [15:32:54] <asterix> they can have resource if we know the real jid
-# [15:33:07] <asterix> and that resource is in contact.resource
-
 def get_number_of_accounts():
-	'''returns the number of ALL accounts'''
+	"""
+	Return the number of ALL accounts
+	"""
 	return len(connections.keys())
 
 def get_number_of_connected_accounts(accounts_list = None):
-	'''returns the number of CONNECTED accounts
-	you can optionally pass an accounts_list
-	and if you do those will be checked, else all will be checked'''
+	"""
+	Returns the number of CONNECTED accounts. Uou can optionally pass an
+	accounts_list and if you do those will be checked, else all will be checked
+	"""
 	connected_accounts = 0
 	if accounts_list is None:
 		accounts = connections.keys()
@@ -327,7 +319,9 @@ def zeroconf_is_connected():
 		config.get_per('accounts', ZEROCONF_ACC_NAME, 'is_zeroconf')
 
 def get_number_of_securely_connected_accounts():
-	'''returns the number of the accounts that are SSL/TLS connected'''
+	"""
+	Return the number of the accounts that are SSL/TLS connected
+	"""
 	num_of_secured = 0
 	for account in connections.keys():
 		if account_is_securely_connected(account):
@@ -342,8 +336,11 @@ def account_is_securely_connected(account):
 		return False
 
 def get_transport_name_from_jid(jid, use_config_setting = True):
-	'''returns 'aim', 'gg', 'irc' etc
-	if JID is not from transport returns None'''
+	"""
+	Returns 'aim', 'gg', 'irc' etc
+
+	If JID is not from transport returns None.
+	"""
 	#FIXME: jid can be None! one TB I saw had this problem:
 	# in the code block # it is a groupchat presence in handle_event_notify
 	# jid was None. Yann why?
@@ -379,21 +376,27 @@ def jid_is_transport(jid):
 	return False
 
 def get_jid_from_account(account_name):
-	'''return the jid we use in the given account'''
+	"""
+	Return the jid we use in the given account
+	"""
 	name = config.get_per('accounts', account_name, 'name')
 	hostname = config.get_per('accounts', account_name, 'hostname')
 	jid = name + '@' + hostname
 	return jid
 
 def get_our_jids():
-	'''returns a list of the jids we use in our accounts'''
+	"""
+	Returns a list of the jids we use in our accounts
+	"""
 	our_jids = list()
 	for account in contacts.get_accounts():
 		our_jids.append(get_jid_from_account(account))
 	return our_jids
 
 def get_hostname_from_account(account_name, use_srv = False):
-	'''returns hostname (if custom hostname is used, that is returned)'''
+	"""
+	Returns hostname (if custom hostname is used, that is returned)
+	"""
 	if use_srv and connections[account_name].connected_hostname:
 		return connections[account_name].connected_hostname
 	if config.get_per('accounts', account_name, 'use_custom_host'):
@@ -401,7 +404,9 @@ def get_hostname_from_account(account_name, use_srv = False):
 	return config.get_per('accounts', account_name, 'hostname')
 
 def get_notification_image_prefix(jid):
-	'''returns the prefix for the notification images'''
+	"""
+	Returns the prefix for the notification images
+	"""
 	transport_name = get_transport_name_from_jid(jid)
 	if transport_name in ('aim', 'icq', 'msn', 'yahoo', 'facebook'):
 		prefix = transport_name
@@ -410,7 +415,9 @@ def get_notification_image_prefix(jid):
 	return prefix
 
 def get_name_from_jid(account, jid):
-	'''returns from JID's shown name and if no contact returns jids'''
+	"""
+	Return from JID's shown name and if no contact returns jids
+	"""
 	contact = contacts.get_first_contact_from_jid(account, jid)
 	if contact:
 		actor = contact.get_shown_name()
@@ -419,7 +426,9 @@ def get_name_from_jid(account, jid):
 	return actor
 
 def get_priority(account, show):
-	'''return the priority an account must have'''
+	"""
+	Return the priority an account must have
+	"""
 	if not show:
 		show = 'online'
 
diff --git a/src/common/helpers.py b/src/common/helpers.py
index 70bdfc9fe..15dc0f7ee 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -38,7 +38,7 @@ import errno
 import select
 import base64
 import hashlib
-import caps
+import caps_cache
 
 from encodings.punycode import punycode_encode
 
@@ -92,15 +92,19 @@ def decompose_jid(jidstring):
 	return user, server, resource
 
 def parse_jid(jidstring):
-	'''Perform stringprep on all JID fragments from a string
-	and return the full jid'''
+	"""
+	Perform stringprep on all JID fragments from a string and return the full
+	jid
+	"""
 	# This function comes from http://svn.twistedmatrix.com/cvs/trunk/twisted/words/protocols/jabber/jid.py
 
 	return prep(*decompose_jid(jidstring))
 
 def idn_to_ascii(host):
-	'''convert IDN (Internationalized Domain Names) to ACE
-	(ASCII-compatible encoding)'''
+	"""
+	Convert IDN (Internationalized Domain Names) to ACE (ASCII-compatible
+	encoding)
+	"""
 	from encodings import idna
 	labels = idna.dots.split(host)
 	converted_labels = []
@@ -109,8 +113,10 @@ def idn_to_ascii(host):
 	return ".".join(converted_labels)
 
 def ascii_to_idn(host):
-	'''convert ACE (ASCII-compatible encoding) to IDN
-	(Internationalized Domain Names)'''
+	"""
+	Convert ACE (ASCII-compatible encoding) to IDN (Internationalized Domain
+	Names)
+	"""
 	from encodings import idna
 	labels = idna.dots.split(host)
 	converted_labels = []
@@ -119,7 +125,9 @@ def ascii_to_idn(host):
 	return ".".join(converted_labels)
 
 def parse_resource(resource):
-	'''Perform stringprep on resource and return it'''
+	"""
+	Perform stringprep on resource and return it
+	"""
 	if resource:
 		try:
 			from xmpp.stringprepare import resourceprep
@@ -128,10 +136,11 @@ def parse_resource(resource):
 			raise InvalidFormat, 'Invalid character in resource.'
 
 def prep(user, server, resource):
-	'''Perform stringprep on all JID fragments and return the full jid'''
+	"""
+	Perform stringprep on all JID fragments and return the full jid
+	"""
 	# This function comes from
 	#http://svn.twistedmatrix.com/cvs/trunk/twisted/words/protocols/jabber/jid.py
-
 	if user:
 		try:
 			from xmpp.stringprepare import nodeprep
@@ -186,10 +195,13 @@ def temp_failure_retry(func, *args, **kwargs):
 				raise
 
 def get_uf_show(show, use_mnemonic = False):
-	'''returns a userfriendly string for dnd/xa/chat
-	and makes all strings translatable
-	if use_mnemonic is True, it adds _ so GUI should call with True
-	for accessibility issues'''
+	"""
+	Return a userfriendly string for dnd/xa/chat and make all strings
+	translatable
+
+	If use_mnemonic is True, it adds _ so GUI should call with True for
+	accessibility issues
+	"""
 	if show == 'dnd':
 		if use_mnemonic:
 			uf_show = _('_Busy')
@@ -324,7 +336,9 @@ def from_one_line(msg):
 	return msg
 
 def get_uf_chatstate(chatstate):
-	'''removes chatstate jargon and returns user friendly messages'''
+	"""
+	Remove chatstate jargon and returns user friendly messages
+	"""
 	if chatstate == 'active':
 		return _('is paying attention to the conversation')
 	elif chatstate == 'inactive':
@@ -339,10 +353,11 @@ def get_uf_chatstate(chatstate):
 	return ''
 
 def is_in_path(command, return_abs_path=False):
-	'''Returns True if 'command' is found in one of the directories in the
-		user's path. If 'return_abs_path' is True, returns the absolute path of
-		the first found command instead. Returns False otherwise and on errors.'''
-
+	"""
+	Return True if 'command' is found in one of the directories in the user's
+	path. If 'return_abs_path' is True, return the absolute path of the first
+	found command instead. Return False otherwise and on errors
+	"""
 	for directory in os.getenv('PATH').split(os.pathsep):
 		try:
 			if command in os.listdir(directory):
@@ -405,7 +420,9 @@ def get_output_of_command(command):
 	return output
 
 def decode_string(string):
-	'''try to decode (to make it Unicode instance) given string'''
+	"""
+	Try to decode (to make it Unicode instance) given string
+	"""
 	if isinstance(string, unicode):
 		return string
 	# by the time we go to iso15 it better be the one else we show bad characters
@@ -420,7 +437,9 @@ def decode_string(string):
 	return string
 
 def ensure_utf8_string(string):
-	'''make sure string is in UTF-8'''
+	"""
+	Make sure string is in UTF-8
+	"""
 	try:
 		string = decode_string(string).encode('utf-8')
 	except Exception:
@@ -428,28 +447,28 @@ def ensure_utf8_string(string):
 	return string
 
 def get_windows_reg_env(varname, default=''):
-	'''asks for paths commonly used but not exposed as ENVs
-	in english Windows 2003 those are:
-	'AppData' = %USERPROFILE%\Application Data (also an ENV)
-	'Desktop' = %USERPROFILE%\Desktop
-	'Favorites' = %USERPROFILE%\Favorites
-	'NetHood' = %USERPROFILE%\NetHood
-	'Personal' = D:\My Documents (PATH TO MY DOCUMENTS)
-	'PrintHood' = %USERPROFILE%\PrintHood
-	'Programs' = %USERPROFILE%\Start Menu\Programs
-	'Recent' = %USERPROFILE%\Recent
-	'SendTo' = %USERPROFILE%\SendTo
-	'Start Menu' = %USERPROFILE%\Start Menu
-	'Startup' = %USERPROFILE%\Start Menu\Programs\Startup
-	'Templates' = %USERPROFILE%\Templates
-	'My Pictures' = D:\My Documents\My Pictures
-	'Local Settings' = %USERPROFILE%\Local Settings
-	'Local AppData' = %USERPROFILE%\Local Settings\Application Data
-	'Cache' = %USERPROFILE%\Local Settings\Temporary Internet Files
-	'Cookies' = %USERPROFILE%\Cookies
-	'History' = %USERPROFILE%\Local Settings\History
-	'''
-
+	"""
+	Ask for paths commonly used but not exposed as ENVs in english Windows 2003
+	those are:
+		'AppData' = %USERPROFILE%\Application Data (also an ENV)
+		'Desktop' = %USERPROFILE%\Desktop
+		'Favorites' = %USERPROFILE%\Favorites
+		'NetHood' = %USERPROFILE%\NetHood
+		'Personal' = D:\My Documents (PATH TO MY DOCUMENTS)
+		'PrintHood' = %USERPROFILE%\PrintHood
+		'Programs' = %USERPROFILE%\Start Menu\Programs
+		'Recent' = %USERPROFILE%\Recent
+		'SendTo' = %USERPROFILE%\SendTo
+		'Start Menu' = %USERPROFILE%\Start Menu
+		'Startup' = %USERPROFILE%\Start Menu\Programs\Startup
+		'Templates' = %USERPROFILE%\Templates
+		'My Pictures' = D:\My Documents\My Pictures
+		'Local Settings' = %USERPROFILE%\Local Settings
+		'Local AppData' = %USERPROFILE%\Local Settings\Application Data
+		'Cache' = %USERPROFILE%\Local Settings\Temporary Internet Files
+		'Cookies' = %USERPROFILE%\Cookies
+		'History' = %USERPROFILE%\Local Settings\History
+	"""
 	if os.name != 'nt':
 		return ''
 
@@ -467,7 +486,9 @@ r'Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders')
 	return val
 
 def get_my_pictures_path():
-	'''windows-only atm. [Unix lives in the past]'''
+	"""
+	Windows-only atm
+	"""
 	return get_windows_reg_env('My Pictures')
 
 def get_desktop_path():
@@ -485,8 +506,10 @@ def get_documents_path():
 	return path
 
 def sanitize_filename(filename):
-	'''makes sure the filename we will write does contain only acceptable and
-	latin characters, and is not too long (in that case hash it)'''
+	"""
+	Make sure the filename we will write does contain only acceptable and latin
+	characters, and is not too long (in that case hash it)
+	"""
 	# 48 is the limit
 	if len(filename) > 48:
 		hash = hashlib.md5(filename)
@@ -502,11 +525,13 @@ def sanitize_filename(filename):
 	return filename
 
 def reduce_chars_newlines(text, max_chars = 0, max_lines = 0):
-	'''Cut the chars after 'max_chars' on each line
-	and show only the first 'max_lines'.
-	If any of the params is not present (None or 0) the action
-	on it is not performed'''
+	"""
+	Cut the chars after 'max_chars' on each line and show only the first
+	'max_lines'
 
+	If any of the params is not present (None or 0) the action on it is not
+	performed
+	"""
 	def _cut_if_long(string):
 		if len(string) > max_chars:
 			string = string[:max_chars - 3] + '...'
@@ -535,10 +560,11 @@ def get_account_status(account):
 	return status
 
 def get_avatar_path(prefix):
-	'''Returns the filename of the avatar, distinguishes between user- and
-	contact-provided one.  Returns None if no avatar was found at all.
-	prefix is the path to the requested avatar just before the ".png" or
-	".jpeg".'''
+	"""
+	Return the filename of the avatar, distinguishes between user- and contact-
+	provided one. Return None if no avatar was found at all.  prefix is the path
+	to the requested avatar just before the ".png" or ".jpeg"
+	"""
 	# First, scan for a local, user-set avatar
 	for type_ in ('jpeg', 'png'):
 		file_ = prefix + '_local.' + type_
@@ -552,13 +578,16 @@ def get_avatar_path(prefix):
 	return None
 
 def datetime_tuple(timestamp):
-	'''Converts timestamp using strptime and the format: %Y%m%dT%H:%M:%S
+	"""
+	Convert timestamp using strptime and the format: %Y%m%dT%H:%M:%S
+
 	Because of various datetime formats are used the following exceptions
 	are handled:
 		- Optional milliseconds appened to the string are removed
 		- Optional Z (that means UTC) appened to the string are removed
 		- XEP-082 datetime strings have all '-' cahrs removed to meet
-		  the above format.'''
+		  the above format.
+	"""
 	timestamp = timestamp.split('.')[0]
 	timestamp = timestamp.replace('-', '')
 	timestamp = timestamp.replace('z', '')
@@ -569,8 +598,6 @@ def datetime_tuple(timestamp):
 # import gajim only when needed (after decode_string is defined) see #4764
 
 import gajim
-import pep
-
 
 def convert_bytes(string):
 	suffix = ''
@@ -611,8 +638,11 @@ def convert_bytes(string):
 	return suffix % unicode(bytes)
 
 def get_contact_dict_for_account(account):
-	''' create a dict of jid, nick -> contact with all contacts of account.
-	Can be used for completion lists'''
+	"""
+	Create a dict of jid, nick -> contact with all contacts of account.
+
+	Can be used for completion lists
+	"""
 	contacts_dict = {}
 	for jid in gajim.contacts.get_jid_list(account):
 		contact = gajim.contacts.get_contact_with_highest_priority(account,
@@ -694,13 +724,15 @@ def play_sound(event):
 	path_to_soundfile = gajim.config.get_per('soundevents', event, 'path')
 	play_sound_file(path_to_soundfile)
 
-def check_soundfile_path(file,
-								 dirs=(gajim.gajimpaths.root, gajim.DATA_DIR)):
-	'''Check if the sound file exists.
+def check_soundfile_path(file, dirs=(gajim.gajimpaths.root, gajim.DATA_DIR)):
+	"""
+	Check if the sound file exists
+
 	:param file: the file to check, absolute or relative to 'dirs' path
 	:param dirs: list of knows paths to fallback if the file doesn't exists
 					 (eg: ~/.gajim/sounds/, DATADIR/sounds...).
-	:return      the path to file or None if it doesn't exists.'''
+	:return      the path to file or None if it doesn't exists.
+	"""
 	if not file:
 		return None
 	elif os.path.exists(file):
@@ -712,16 +744,17 @@ def check_soundfile_path(file,
 			return d
 	return None
 
-def strip_soundfile_path(file,
-								 dirs=(gajim.gajimpaths.root, gajim.DATA_DIR),
-								 abs=True):
-	'''Remove knowns paths from a sound file:
+def strip_soundfile_path(file, dirs=(gajim.gajimpaths.root, gajim.DATA_DIR),
+		abs=True):
+	"""
+	Remove knowns paths from a sound file
+
 	Filechooser returns absolute path. If path is a known fallback path, we remove it.
 	So config have no hardcoded path	to DATA_DIR and text in textfield is shorther.
 	param: file: the filename to strip.
 	param: dirs: list of knowns paths from which the filename should be stripped.
 	param:  abs: force absolute path on dirs
-	'''
+	"""
 	if not file:
 		return None
 
@@ -777,56 +810,11 @@ def get_global_status():
 			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.'''
+	"""
+	Test if all statuses are the same
+	"""
 	reference = None
 	for account in gajim.connections:
 		if not gajim.config.get_per('accounts', account,
@@ -839,7 +827,9 @@ def statuses_unified():
 	return True
 
 def get_icon_name_to_show(contact, account = None):
-	'''Get the icon name to show in online, away, requested, ...'''
+	"""
+	Get the icon name to show in online, away, requested, etc
+	"""
 	if account and gajim.events.get_nb_roster_events(account, contact.jid):
 		return 'event'
 	if account and gajim.events.get_nb_roster_events(account,
@@ -868,16 +858,22 @@ def get_icon_name_to_show(contact, account = None):
 	return 'not in roster'
 
 def get_full_jid_from_iq(iq_obj):
-	'''return the full jid (with resource) from an iq as unicode'''
+	"""
+	Return the full jid (with resource) from an iq as unicode
+	"""
 	return parse_jid(str(iq_obj.getFrom()))
 
 def get_jid_from_iq(iq_obj):
-	'''return the jid (without resource) from an iq as unicode'''
+	"""
+	Return the jid (without resource) from an iq as unicode
+	"""
 	jid = get_full_jid_from_iq(iq_obj)
 	return gajim.get_jid_without_resource(jid)
 
 def get_auth_sha(sid, initiator, target):
-	''' return sha of sid + initiator + target used for proxy auth'''
+	"""
+	Return sha of sid + initiator + target used for proxy auth
+	"""
 	return hashlib.sha1("%s%s%s" % (sid, initiator, target)).hexdigest()
 
 def remove_invalid_xml_chars(string):
@@ -910,7 +906,9 @@ distro_info = {
 }
 
 def get_random_string_16():
-	''' create random string of length 16'''
+	"""
+	Create random string of length 16
+	"""
 	rng = range(65, 90)
 	rng.extend(range(48, 57))
 	char_sequence = [chr(e) for e in rng]
@@ -921,7 +919,8 @@ def get_os_info():
 	if gajim.os_info:
 		return gajim.os_info
 	if os.name == 'nt':
-		ver = os.sys.getwindowsversion()
+		# platform.release() seems to return the name of the windows
+		ver = sys.getwindowsversion()
 		ver_format = ver[3], ver[0], ver[1]
 		win_version = {
 			(1, 4, 0): '95',
@@ -932,6 +931,7 @@ def get_os_info():
 			(2, 5, 1): 'XP',
 			(2, 5, 2): '2003',
 			(2, 6, 0): 'Vista',
+			(2, 6, 1): '7',
 		}
 		if ver_format in win_version:
 			os_info = 'Windows' + ' ' + win_version[ver_format]
@@ -995,11 +995,14 @@ def get_os_info():
 
 
 def allow_showing_notification(account, type_ = 'notify_on_new_message',
-advanced_notif_num = None, is_first_message = True):
-	'''is it allowed to show nofication?
-	check OUR status and if we allow notifications for that status
-	type is the option that need to be True e.g.: notify_on_signing
-	is_first_message: set it to false when it's not the first message'''
+		advanced_notif_num = None, is_first_message = True):
+	"""
+	Is it allowed to show nofication?
+
+	Check OUR status and if we allow notifications for that status type is the
+	option that need to be True e.g.: notify_on_signing is_first_message: set it
+	to false when it's not the first message
+	"""
 	if advanced_notif_num is not None:
 		popup = gajim.config.get_per('notifications', str(advanced_notif_num),
 			'popup')
@@ -1016,7 +1019,9 @@ advanced_notif_num = None, is_first_message = True):
 	return False
 
 def allow_popup_window(account, advanced_notif_num = None):
-	'''is it allowed to popup windows?'''
+	"""
+	Is it allowed to popup windows?
+	"""
 	if advanced_notif_num is not None:
 		popup = gajim.config.get_per('notifications', str(advanced_notif_num),
 			'auto_open')
@@ -1067,8 +1072,10 @@ def get_chat_control(account, contact):
 		return gajim.interface.msg_win_mgr.get_control(contact.jid, account)
 
 def get_notification_icon_tooltip_dict():
-	'''returns a dict of the form {acct: {'show': show, 'message': message,
-	'event_lines': [list of text lines to show in tooltip]}'''
+	"""
+	Return a dict of the form {acct: {'show': show, 'message': message,
+	'event_lines': [list of text lines to show in tooltip]}
+	"""
 	# How many events must there be before they're shown summarized, not per-user
 	max_ungrouped_events = 10
 
@@ -1180,7 +1187,9 @@ def get_notification_icon_tooltip_text():
 	return text
 
 def get_accounts_info():
-	'''helper for notification icon tooltip'''
+	"""
+	Helper for notification icon tooltip
+	"""
 	accounts = []
 	accounts_list = sorted(gajim.contacts.get_accounts())
 	for account in accounts_list:
@@ -1231,9 +1240,14 @@ def get_transport_path(transport):
 	return get_iconset_path(gajim.config.get('iconset'))
 
 def prepare_and_validate_gpg_keyID(account, jid, keyID):
-	'''Returns an eight char long keyID that can be used with for GPG encryption with this contact.
-	If the given keyID is None, return UNKNOWN; if the key does not match the assigned key
-	XXXXXXXXMISMATCH is returned. If the key is trusted and not yet assigned, assign it'''
+	"""
+	Return an eight char long keyID that can be used with for GPG encryption
+	with this contact
+
+	If the given keyID is None, return UNKNOWN; if the key does not match the
+	assigned key XXXXXXXXMISMATCH is returned. If the key is trusted and not yet
+	assigned, assign it.
+	"""
 	if gajim.connections[account].USE_GPG:
 		if keyID and len(keyID) == 16:
 			keyID = keyID[8:]
@@ -1276,10 +1290,14 @@ def update_optional_features(account = None):
 			gajim.gajim_optional_features[a].append(xmpp.NS_ACTIVITY + '+notify')
 		if gajim.config.get_per('accounts', a, 'publish_tune'):
 			gajim.gajim_optional_features[a].append(xmpp.NS_TUNE)
+		if gajim.config.get_per('accounts', a, 'publish_location'):
+			gajim.gajim_optional_features[a].append(xmpp.NS_LOCATION)
 		if gajim.config.get_per('accounts', a, 'subscribe_tune'):
 			gajim.gajim_optional_features[a].append(xmpp.NS_TUNE + '+notify')
 		if gajim.config.get_per('accounts', a, 'subscribe_nick'):
 			gajim.gajim_optional_features[a].append(xmpp.NS_NICK + '+notify')
+		if gajim.config.get_per('accounts', a, 'subscribe_location'):
+			gajim.gajim_optional_features[a].append(xmpp.NS_LOCATION + '+notify')
 		if gajim.config.get('outgoing_chat_state_notifactions') != 'disabled':
 			gajim.gajim_optional_features[a].append(xmpp.NS_CHATSTATES)
 		if not gajim.config.get('ignore_incoming_xhtml'):
@@ -1295,7 +1313,7 @@ def update_optional_features(account = None):
 			gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_AUDIO)
 			gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_VIDEO)
 			gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_ICE_UDP)
-		gajim.caps_hash[a] = caps.compute_caps_hash([gajim.gajim_identity],
+		gajim.caps_hash[a] = caps_cache.compute_caps_hash([gajim.gajim_identity],
 			gajim.gajim_common_features + gajim.gajim_optional_features[a])
 		# re-send presence with new hash
 		connected = gajim.connections[a].connected
diff --git a/src/common/i18n.py b/src/common/i18n.py
index 3c47d3da3..7b9e8dab3 100644
--- a/src/common/i18n.py
+++ b/src/common/i18n.py
@@ -32,7 +32,7 @@ def paragraph_direction_mark(text):
 	"""
 	Determine paragraph writing direction according to
 	http://www.unicode.org/reports/tr9/#The_Paragraph_Level
-	
+
 	Returns either Unicode LTR mark or RTL mark.
 	"""
 	for char in text:
@@ -84,11 +84,12 @@ def Q_(s):
 	return s
 
 def ngettext(s_sing, s_plural, n, replace_sing = None, replace_plural = None):
-	'''use as:
-	i18n.ngettext('leave room %s', 'leave rooms %s', len(rooms), 'a', 'a, b, c')
+	"""
+	Use as:
+		i18n.ngettext('leave room %s', 'leave rooms %s', len(rooms), 'a', 'a, b, c')
 
-	in other words this is a hack to ngettext() to support %s %d etc..
-	'''
+	In other words this is a hack to ngettext() to support %s %d etc..
+	"""
 	text = _translation.ungettext(s_sing, s_plural, n)
 	if n == 1 and replace_sing is not None:
 		text = text % replace_sing
diff --git a/src/common/idle.py b/src/common/idle.py
index eb7e1be6a..d3ff4dff7 100644
--- a/src/common/idle.py
+++ b/src/common/idle.py
@@ -73,7 +73,10 @@ except OSError, e:
 	xss_available = False
 
 def getIdleSec():
-	"""Returns the idle time in seconds"""
+	global xss_available
+	"""
+	Return the idle time in seconds
+	"""
 	if not xss_available:
 		return 0
 	if libXss.XScreenSaverQueryInfo(dpy_p, rootwindow, xss_info_p) == 0:
diff --git a/src/common/jingle.py b/src/common/jingle.py
index 6549ee10c..73745592a 100644
--- a/src/common/jingle.py
+++ b/src/common/jingle.py
@@ -10,20 +10,11 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 ##
-''' Handles the jingle signalling protocol. '''
+"""
+Handles the jingle signalling protocol
+"""
 
 #TODO:
-# * things in XEP 0166, including:
-#   - 'senders' attribute of 'content' element
-#   - security preconditions
-#   * actions:
-#     - content-modify
-#     - description-info, session-info
-#     - security-info
-#     - transport-accept, transport-reject
-#   * sid/content related:
-#      - tiebreaking
-#      - if there already is a session, use it
 # * things in XEP 0176, including:
 #      - http://xmpp.org/extensions/xep-0176.html#protocol-restarts
 #      - http://xmpp.org/extensions/xep-0176.html#fallback
@@ -34,1070 +25,23 @@
 #   - video integration
 #   * config:
 #     - codecs
-#     - STUN
 
-# * DONE: figure out why it doesn't work with pidgin:
-#     That's a bug in pidgin: http://xmpp.org/extensions/xep-0176.html#protocol-checks
+# * figure out why it doesn't work with pidgin:
+#     That's maybe a bug in pidgin:
+#       http://xmpp.org/extensions/xep-0176.html#protocol-checks
 
-# * timeout
-
-# * split this file in several modules
-#   For example, a file dedicated for XEP0166, one for XEP0176,
-#   and one for XEP0167
-
-# * handle different kinds of sink and src elements
-
-import gobject
-
-import gajim
 import xmpp
 import helpers
 
-import farsight, gst
-
-def get_first_gst_element(elements):
-	''' Returns, if it exists, the first available element of the list. '''
-	for name in elements:
-		factory = gst.element_factory_find(name)
-		if factory:
-			return factory.create()
-
-#FIXME: Move it to JingleSession.States?
-class JingleStates(object):
-	''' States in which jingle session may exist. '''
-	ended = 0
-	pending = 1
-	active = 2
-
-#FIXME: Move it to JingleTransport.Type?
-class TransportType(object):
-	''' Possible types of a JingleTransport '''
-	datagram = 1
-	streaming = 2
-
-class OutOfOrder(Exception):
-	''' Exception that should be raised when an action is received when in the wrong state. '''
-
-class TieBreak(Exception):
-	''' Exception that should be raised in case of a tie, when we overrule the other action. '''
-
-class JingleSession(object):
-	''' This represents one jingle session. '''
-	def __init__(self, con, weinitiate, jid, sid=None):
-		''' con -- connection object,
-			 weinitiate -- boolean, are we the initiator?
-			 jid - jid of the other entity'''
-		self.contents = {} # negotiated contents
-		self.connection = con # connection to use
-		# our full jid
-		self.ourjid = gajim.get_jid_from_account(self.connection.name) + '/' + \
-			con.server_resource
-		self.peerjid = jid # jid we connect to
-		# jid we use as the initiator
-		self.initiator = weinitiate and self.ourjid or self.peerjid
-		# jid we use as the responder
-		self.responder = weinitiate and self.peerjid or self.ourjid
-		# are we an initiator?
-		self.weinitiate = weinitiate
-		# what state is session in? (one from JingleStates)
-		self.state = JingleStates.ended
-		if not sid:
-			sid = con.connection.getAnID()
-		self.sid = sid # sessionid
-
-		self.accepted = True # is this session accepted by user
-
-		# callbacks to call on proper contents
-		# use .prepend() to add new callbacks, especially when you're going
-		# to send error instead of ack
-		self.callbacks = {
-			'content-accept':	[self.__contentAcceptCB, self.__broadcastCB,
-				self.__defaultCB],
-			'content-add':		[self.__contentAddCB, self.__broadcastCB,
-				self.__defaultCB], #TODO
-			'content-modify':	[self.__defaultCB], #TODO
-			'content-reject':	[self.__defaultCB, self.__contentRemoveCB], #TODO
-			'content-remove':	[self.__defaultCB, self.__contentRemoveCB],
-			'description-info':	[self.__broadcastCB, self.__defaultCB], #TODO
-			'security-info':	[self.__defaultCB], #TODO
-			'session-accept':	[self.__sessionAcceptCB, self.__contentAcceptCB,
-				self.__broadcastCB, self.__defaultCB],
-			'session-info':		[self.__sessionInfoCB, self.__broadcastCB, self.__defaultCB],
-			'session-initiate':	[self.__sessionInitiateCB, self.__broadcastCB,
-				self.__defaultCB],
-			'session-terminate':	[self.__sessionTerminateCB, self.__broadcastAllCB,
-				self.__defaultCB],
-			'transport-info':	[self.__broadcastCB, self.__defaultCB],
-			'transport-replace':	[self.__broadcastCB, self.__transportReplaceCB], #TODO
-			'transport-accept':	[self.__defaultCB], #TODO
-			'transport-reject':	[self.__defaultCB], #TODO
-			'iq-result':		[],
-			'iq-error':		[self.__errorCB],
-		}
-
-	''' Interaction with user '''
-	def approve_session(self):
-		''' Called when user accepts session in UI (when we aren't the initiator).
-		'''
-		self.accept_session()
-
-	def decline_session(self):
-		''' Called when user declines session in UI (when we aren't the initiator)
-		'''
-		reason = xmpp.Node('reason')
-		reason.addChild('decline')
-		self._session_terminate(reason)
-
-	def approve_content(self, media):
-		content = self.get_content(media)
-		if content:
-			content.accepted = True
-			self.on_session_state_changed(content)
-
-	def reject_content(self, media):
-		content = self.get_content(media)
-		if content:
-			if self.state == JingleStates.active:
-				self.__content_reject(content)
-			content.destroy()
-			self.on_session_state_changed()
-
-	def end_session(self):
-		''' Called when user stops or cancel session in UI. '''
-		reason = xmpp.Node('reason')
-		if self.state == JingleStates.active:
-			reason.addChild('success')
-		else:
-			reason.addChild('cancel')
-		self._session_terminate(reason)
-
-	''' Middle-level functions to manage contents. Handle local content
-	cache and send change notifications. '''
-	def get_content(self, media=None):
-		if media == 'audio':
-			cls = JingleVoIP
-		elif media == 'video':
-			cls = JingleVideo
-		#elif media == None:
-		#	cls = JingleContent
-		else:
-			return None
-
-		for content in self.contents.values():
-			if isinstance(content, cls):
-				return content
-
-	def add_content(self, name, content, creator='we'):
-		''' Add new content to session. If the session is active,
-		this will send proper stanza to update session. 
-		Creator must be one of ('we', 'peer', 'initiator', 'responder')'''
-		assert creator in ('we', 'peer', 'initiator', 'responder')
-
-		if (creator == 'we' and self.weinitiate) or (creator == 'peer' and \
-		not self.weinitiate):
-			creator = 'initiator'
-		elif (creator == 'peer' and self.weinitiate) or (creator == 'we' and \
-		not self.weinitiate):
-			creator = 'responder'
-		content.creator = creator
-		content.name = name
-		self.contents[(creator, name)] = content
-
-		if (creator == 'initiator') == self.weinitiate:
-			# The content is from us, accept it
-			content.accepted = True
-
-	def remove_content(self, creator, name):
-		''' We do not need this now '''
-		#TODO:
-		if (creator, name) in self.contents:
-			content = self.contents[(creator, name)]
-			if len(self.contents) > 1:
-				self.__content_remove(content)
-			self.contents[(creator, name)].destroy()
-		if len(self.contents) == 0:
-			self.end_session()
-
-	def modify_content(self, creator, name, *someother):
-		''' We do not need this now '''
-		pass
-
-	def on_session_state_changed(self, content=None):
-		if self.state == JingleStates.ended:
-			# Session not yet started, only one action possible: session-initiate
-			if self.is_ready() and self.weinitiate:
-				self.__session_initiate()
-		elif self.state == JingleStates.pending:
-			# We can either send a session-accept or a content-add
-			if self.is_ready() and not self.weinitiate:
-				self.__session_accept()
-			elif content and (content.creator == 'initiator') == self.weinitiate:
-				self.__content_add(content)
-			elif content and self.weinitiate:
-				self.__content_accept(content)
-		elif self.state == JingleStates.active:
-			# We can either send a content-add or a content-accept
-			if not content:
-				return
-			if (content.creator == 'initiator') == self.weinitiate:
-				# We initiated this content. It's a pending content-add.
-				self.__content_add(content)
-			else:
-				# The other side created this content, we accept it.
-				self.__content_accept(content)
-
-	def is_ready(self):
-		''' Returns True when all codecs and candidates are ready
-		(for all contents). '''
-		return (all((content.is_ready() for content in self.contents.itervalues()))
-			and self.accepted)
-
-	''' Middle-level function to do stanza exchange. '''
-	def accept_session(self):
-		''' Mark the session as accepted. '''
-		self.accepted = True
-		self.on_session_state_changed()
-
-	def start_session(self):
-		''' Mark the session as ready to be started. '''
-		self.accepted = True
-		self.on_session_state_changed()
-
-	def send_session_info(self):
-		pass
-
-	def send_content_accept(self, content):
-		assert self.state != JingleStates.ended
-		stanza, jingle = self.__make_jingle('content-accept')
-		jingle.addChild(node=content)
-		self.connection.connection.send(stanza)
-
-	def send_transport_info(self, content):
-		assert self.state != JingleStates.ended
-		stanza, jingle = self.__make_jingle('transport-info')
-		jingle.addChild(node=content)
-		self.connection.connection.send(stanza)
-
-	''' Session callbacks. '''
-	def stanzaCB(self, stanza):
-		''' A callback for ConnectionJingle. It gets stanza, then
-		tries to send it to all internally registered callbacks.
-		First one to raise xmpp.NodeProcessed breaks function.'''
-		jingle = stanza.getTag('jingle')
-		error = stanza.getTag('error')
-		if error:
-			# it's an iq-error stanza
-			action = 'iq-error'
-		elif jingle:
-			# it's a jingle action
-			action = jingle.getAttr('action')
-			if action not in self.callbacks:
-				self.__send_error(stanza, 'bad_request')
-				return
-			#FIXME: If we aren't initiated and it's not a session-initiate...
-			if action != 'session-initiate' and self.state == JingleStates.ended:
-				self.__send_error(stanza, 'item-not-found', 'unknown-session')
-				return
-		else:
-			# it's an iq-result (ack) stanza
-			action = 'iq-result'
-
-		callables = self.callbacks[action]
-
-		try:
-			for callable in callables:
-				callable(stanza=stanza, jingle=jingle, error=error, action=action)
-		except xmpp.NodeProcessed:
-			pass
-		except TieBreak:
-			self.__send_error(stanza, 'conflict', 'tiebreak')
-		except OutOfOrder:
-			self.__send_error(stanza, 'unexpected-request', 'out-of-order')#FIXME
-
-	def __defaultCB(self, stanza, jingle, error, action):
-		''' Default callback for action stanzas -- simple ack
-		and stop processing. '''
-		response = stanza.buildReply('result')
-		self.connection.connection.send(response)
-
-	def __errorCB(self, stanza, jingle, error, action):
-		#FIXME
-		text = error.getTagData('text')
-		jingle_error = None
-		xmpp_error = None
-		for child in error.getChildren():
-			if child.getNamespace() == xmpp.NS_JINGLE_ERRORS:
-				jingle_error = child.getName()
-			elif child.getNamespace() == xmpp.NS_STANZAS:
-				xmpp_error = child.getName()
-		self.__dispatch_error(xmpp_error, jingle_error, text)
-		#FIXME: Not sure when we would want to do that...
-		if xmpp_error == 'item-not-found':
-			self.connection.delete_jingle_session(self.peerjid, self.sid)
-
-	def __transportReplaceCB(self, stanza, jingle, error, action):
-		for content in jingle.iterTags('content'):
-			creator = content['creator']
-			name = content['name']
-			if (creator, name) in self.contents:
-				transport_ns = content.getTag('transport').getNamespace()
-				if transport_ns == xmpp.JINGLE_ICE_UDP:
-					#FIXME: We don't manage anything else than ICE-UDP now...
-					#What was the previous transport?!?
-					#Anyway, content's transport is not modifiable yet
-					pass
-				else:
-					stanza, jingle = self.__make_jingle('transport-reject')
-					content = jingle.setTag('content', attrs={'creator': creator,
-						'name': name})
-					content.setTag('transport', namespace=transport_ns)
-					self.connection.connection.send(stanza)
-					raise xmpp.NodeProcessed
-			else:
-				#FIXME: This ressource is unknown to us, what should we do?
-				#For now, reject the transport
-				stanza, jingle = self.__make_jingle('transport-reject')
-				c = jingle.setTag('content', attrs={'creator': creator,
-					'name': name})
-				c.setTag('transport', namespace=transport_ns)
-				self.connection.connection.send(stanza)
-				raise xmpp.NodeProcessed
-
-	def __sessionInfoCB(self, stanza, jingle, error, action):
-		#TODO: ringing, active, (un)hold, (un)mute
-		payload = jingle.getPayload()
-		if len(payload) > 0:
-			self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info')
-			raise xmpp.NodeProcessed
-
-	def __contentRemoveCB(self, stanza, jingle, error, action):
-		for content in jingle.iterTags('content'):
-			creator = content['creator']
-			name = content['name']
-			if (creator, name) in self.contents:
-				content = self.contents[(creator, name)]
-				#TODO: this will fail if content is not an RTP content
-				self.connection.dispatch('JINGLE_DISCONNECTED',
-					(self.peerjid, self.sid, content.media, 'removed'))
-				content.destroy()
-		if len(self.contents) == 0:
-			reason = xmpp.Node('reason')
-			reason.setTag('success')
-			self._session_terminate(reason)
-
-	def __sessionAcceptCB(self, stanza, jingle, error, action):
-		if self.state != JingleStates.pending: #FIXME
-			raise OutOfOrder
-		self.state = JingleStates.active
-
-	def __contentAcceptCB(self, stanza, jingle, error, action):
-		''' Called when we get content-accept stanza or equivalent one
-		(like session-accept).'''
-		# check which contents are accepted
-		for content in jingle.iterTags('content'):
-			creator = content['creator']
-			name = content['name']#TODO...
-
-	def __contentAddCB(self, stanza, jingle, error, action):
-		if self.state == JingleStates.ended:
-			raise OutOfOrder
-
-		parse_result = self.__parse_contents(jingle)
-		contents = parse_result[2]
-		rejected_contents = parse_result[3]
-
-		for name, creator in rejected_contents:
-			#TODO:
-			content = JingleContent()
-			self.add_content(name, content, creator)
-			self.__content_reject(content)
-			self.contents[(content.creator, content.name)].destroy()
-
-		self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid,
-			contents))
-
-	def __sessionInitiateCB(self, stanza, jingle, error, action):
-		''' We got a jingle session request from other entity,
-		therefore we are the receiver... Unpack the data,
-		inform the user. '''
-
-		if self.state != JingleStates.ended:
-			raise OutOfOrder
-
-		self.initiator = jingle['initiator']
-		self.responder = self.ourjid
-		self.peerjid = self.initiator
-		self.accepted = False	# user did not accept this session yet
-
-		# TODO: If the initiator is unknown to the receiver (e.g., via presence
-		# subscription) and the receiver has a policy of not communicating via
-		# Jingle with unknown entities, it SHOULD return a <service-unavailable/>
-		# error.
-
-		# Lets check what kind of jingle session does the peer want
-		contents_ok, transports_ok, contents, pouet = self.__parse_contents(jingle)
-
-		# If there's no content we understand...
-		if not contents_ok:
-			# TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate
-			reason = xmpp.Node('reason')
-			reason.setTag('unsupported-applications')
-			self.__defaultCB(stanza, jingle, error, action)
-			self._session_terminate(reason)
-			raise xmpp.NodeProcessed
-
-		if not transports_ok:
-			# TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate
-			reason = xmpp.Node('reason')
-			reason.setTag('unsupported-transports')
-			self.__defaultCB(stanza, jingle, error, action)
-			self._session_terminate(reason)
-			raise xmpp.NodeProcessed
-
-		self.state = JingleStates.pending
-
-		# Send event about starting a session
-		self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid,
-			contents))
-
-	def __broadcastCB(self, stanza, jingle, error, action):
-		''' Broadcast the stanza contents to proper content handlers. '''
-		for content in jingle.iterTags('content'):
-			name = content['name']
-			creator = content['creator']
-			cn = self.contents[(creator, name)]
-			cn.stanzaCB(stanza, content, error, action)
-
-	def __sessionTerminateCB(self, stanza, jingle, error, action):
-		self.connection.delete_jingle_session(self.peerjid, self.sid)
-		reason, text = self.__reason_from_stanza(jingle)
-		if reason not in ('success', 'cancel', 'decline'):
-			self.__dispatch_error(reason, reason, text)
-		if text:
-			text = '%s (%s)' % (reason, text)
-		else:
-			text = reason#TODO
-		self.connection.dispatch('JINGLE_DISCONNECTED',
-			(self.peerjid, self.sid, None, text))
-
-	def __broadcastAllCB(self, stanza, jingle, error, action):
-		''' Broadcast the stanza to all content handlers. '''
-		for content in self.contents.itervalues():
-			content.stanzaCB(stanza, None, error, action)
-
-	''' Internal methods. '''
-	def __parse_contents(self, jingle):
-		#TODO: Needs some reworking
-		contents = []
-		contents_rejected = []
-		contents_ok = False
-		transports_ok = False
-
-		for element in jingle.iterTags('content'):
-			desc = element.getTag('description')
-			desc_ns = desc.getNamespace()
-			tran_ns = element.getTag('transport').getNamespace()
-			if desc_ns == xmpp.NS_JINGLE_RTP and desc['media'] in ('audio', 'video'):
-				contents_ok = True
-				#TODO: Everything here should be moved somewhere else
-				if tran_ns == xmpp.NS_JINGLE_ICE_UDP:
-					if desc['media'] == 'audio':
-						self.add_content(element['name'], JingleVoIP(self), 'peer')
-					else:
-						self.add_content(element['name'], JingleVideo(self), 'peer')
-					contents.append((desc['media'],))
-					transports_ok = True
-				else:
-					contents_rejected.append((element['name'], 'peer'))
-			else:
-				contents_rejected.append((element['name'], 'peer'))
-
-		return (contents_ok, transports_ok, contents, contents_rejected)
-
-	def __dispatch_error(self, error, jingle_error=None, text=None):
-		if jingle_error:
-			error = jingle_error
-		if text:
-			text = '%s (%s)' % (error, text)
-		else:
-			text = error
-		self.connection.dispatch('JINGLE_ERROR', (self.peerjid, self.sid, text))
-
-	def __reason_from_stanza(self, stanza):
-		reason = 'success'
-		reasons = ['success', 'busy', 'cancel', 'connectivity-error',
-			'decline', 'expired', 'failed-application', 'failed-transport',
-			'general-error', 'gone', 'incompatible-parameters', 'media-error',
-			'security-error', 'timeout', 'unsupported-applications',
-			'unsupported-transports']
-		tag = stanza.getTag('reason')
-		if tag:
-			text = tag.getTagData('text')
-			for r in reasons:
-				if tag.getTag(r):
-					reason = r
-					break
-		return (reason, text)
-
-	''' Methods that make/send proper pieces of XML. They check if the session
-	is in appropriate state. '''
-	def __make_jingle(self, action):
-		stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.peerjid))
-		attrs = {'action': action,
-			'sid': self.sid}
-		if action == 'session-initiate':
-			attrs['initiator'] = self.initiator
-		elif action == 'session-accept':
-			attrs['responder'] = self.responder
-		jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE)
-		return stanza, jingle
-
-	def __send_error(self, stanza, error, jingle_error=None, text=None):
-		err = xmpp.Error(stanza, error)
-		err.setNamespace(xmpp.NS_STANZAS)
-		if jingle_error:
-			err.setTag(jingle_error, namespace=xmpp.NS_JINGLE_ERRORS)
-		if text:
-			err.setTagData('text', text)
-		self.connection.connection.send(err)
-		self.__dispatch_error(error, jingle_error, text)
-
-	def __append_content(self, jingle, content):
-		''' Append <content/> element to <jingle/> element,
-		with (full=True) or without (full=False) <content/>
-		children. '''
-		jingle.addChild('content',
-			attrs={'name': content.name, 'creator': content.creator})
-
-	def __append_contents(self, jingle):
-		''' Append all <content/> elements to <jingle/>.'''
-		# TODO: integrate with __appendContent?
-		# TODO: parameters 'name', 'content'?
-		for content in self.contents.values():
-			self.__append_content(jingle, content)
-
-	def __session_initiate(self):
-		assert self.state == JingleStates.ended
-		stanza, jingle = self.__make_jingle('session-initiate')
-		self.__append_contents(jingle)
-		self.__broadcastCB(stanza, jingle, None, 'session-initiate-sent')
-		self.connection.connection.send(stanza)
-		self.state = JingleStates.pending
-
-	def __session_accept(self):
-		assert self.state == JingleStates.pending
-		stanza, jingle = self.__make_jingle('session-accept')
-		self.__append_contents(jingle)
-		self.__broadcastCB(stanza, jingle, None, 'session-accept-sent')
-		self.connection.connection.send(stanza)
-		self.state = JingleStates.active
-
-	def __session_info(self, payload=None):
-		assert self.state != JingleStates.ended
-		stanza, jingle = self.__make_jingle('session-info')
-		if payload:
-			jingle.addChild(node=payload)
-		self.connection.connection.send(stanza)
-
-	def _session_terminate(self, reason=None):
-		assert self.state != JingleStates.ended
-		stanza, jingle = self.__make_jingle('session-terminate')
-		if reason is not None:
-			jingle.addChild(node=reason)
-		self.__broadcastAllCB(stanza, jingle, None, 'session-terminate-sent')
-		self.connection.connection.send(stanza)
-		reason, text = self.__reason_from_stanza(jingle)
-		if reason not in ('success', 'cancel', 'decline'):
-			self.__dispatch_error(reason, reason, text)
-		if text:
-			text = '%s (%s)' % (reason, text)
-		else:
-			text = reason
-		self.connection.delete_jingle_session(self.peerjid, self.sid)
-		self.connection.dispatch('JINGLE_DISCONNECTED',
-			(self.peerjid, self.sid, None, text))
-
-	def __content_add(self, content):
-		#TODO: test
-		assert self.state != JingleStates.ended
-		stanza, jingle = self.__make_jingle('content-add')
-		self.__append_content(jingle, content)
-		self.__broadcastCB(stanza, jingle, None, 'content-add-sent')
-		self.connection.connection.send(stanza)
-
-	def __content_accept(self, content):
-		#TODO: test
-		assert self.state != JingleStates.ended
-		stanza, jingle = self.__make_jingle('content-accept')
-		self.__append_content(jingle, content)
-		self.__broadcastCB(stanza, jingle, None, 'content-accept-sent')
-		self.connection.connection.send(stanza)
-
-	def __content_reject(self, content):
-		assert self.state != JingleStates.ended
-		stanza, jingle = self.__make_jingle('content-reject')
-		self.__append_content(jingle, content)
-		self.connection.connection.send(stanza)
-		#TODO: this will fail if content is not an RTP content
-		self.connection.dispatch('JINGLE_DISCONNECTED',
-			(self.peerjid, self.sid, content.media, 'rejected'))
-
-	def __content_modify(self):
-		assert self.state != JingleStates.ended
-
-	def __content_remove(self, content):
-		assert self.state != JingleStates.ended
-		stanza, jingle = self.__make_jingle('content-remove')
-		self.__append_content(jingle, content)
-		self.connection.connection.send(stanza)
-		#TODO: this will fail if content is not an RTP content
-		self.connection.dispatch('JINGLE_DISCONNECTED',
-			(self.peerjid, self.sid, content.media, 'removed'))
-
-	def content_negociated(self, media):
-		self.connection.dispatch('JINGLE_CONNECTED', (self.peerjid, self.sid,
-			media))
-
-#TODO:
-#class JingleTransport(object):
-#	''' An abstraction of a transport in Jingle sessions. '''
-#	def __init__(self):
-#		pass
-
-
-class JingleContent(object):
-	''' An abstraction of content in Jingle sessions. '''
-	def __init__(self, session, node=None):
-		self.session = session
-		# will be filled by JingleSession.add_content()
-		# don't uncomment these lines, we will catch more buggy code then
-		# (a JingleContent not added to session shouldn't send anything)
-		#self.creator = None
-		#self.name = None
-		self.accepted = False
-		self.sent = False
-		self.candidates = [] # Local transport candidates
-		self.remote_candidates = [] # Remote transport candidates
-
-		self.senders = 'both' #FIXME
-		self.allow_sending = True # Used for stream direction, attribute 'senders'
-
-		self.callbacks = {
-			# these are called when *we* get stanzas
-			'content-accept': [self.__transportInfoCB],
-			'content-add': [self.__transportInfoCB],
-			'content-modify': [],
-			'content-reject': [],
-			'content-remove': [],
-			'description-info': [],
-			'security-info': [],
-			'session-accept': [self.__transportInfoCB],
-			'session-info': [],
-			'session-initiate': [self.__transportInfoCB],
-			'session-terminate': [],
-			'transport-info': [self.__transportInfoCB],
-			'transport-replace': [],
-			'transport-accept': [],
-			'transport-reject': [],
-			'iq-result': [],
-			'iq-error': [],
-			# these are called when *we* sent these stanzas
-			'content-accept-sent': [self.__fillJingleStanza],
-			'content-add-sent': [self.__fillJingleStanza],
-			'session-initiate-sent': [self.__fillJingleStanza],
-			'session-accept-sent': [self.__fillJingleStanza],
-			'session-terminate-sent': [],
-		}
-
-	def is_ready(self):
-		#print '[%s] %s, %s' % (self.media, self.candidates_ready,
-		#	self.p2psession.get_property('codecs-ready'))
-		return (self.accepted and self.candidates_ready and not self.sent
-			and self.p2psession.get_property('codecs-ready'))
-
-	def stanzaCB(self, stanza, content, error, action):
-		''' Called when something related to our content was sent by peer. '''
-		if action in self.callbacks:
-			for callback in self.callbacks[action]:
-				callback(stanza, content, error, action)
-
-	def __transportInfoCB(self, stanza, content, error, action):
-		''' Got a new transport candidate. '''
-		candidates = []
-		transport = content.getTag('transport')
-		for candidate in transport.iterTags('candidate'):
-			cand = farsight.Candidate()
-			cand.component_id = int(candidate['component'])
-			cand.ip = str(candidate['ip'])
-			cand.port = int(candidate['port'])
-			cand.foundation = str(candidate['foundation'])
-			#cand.type = farsight.CANDIDATE_TYPE_LOCAL
-			cand.priority = int(candidate['priority'])
-
-			if candidate['protocol'] == 'udp':
-				cand.proto = farsight.NETWORK_PROTOCOL_UDP
-			else:
-				# we actually don't handle properly different tcp options in jingle
-				cand.proto = farsight.NETWORK_PROTOCOL_TCP
-
-			cand.username = str(transport['ufrag'])
-			cand.password = str(transport['pwd'])
-
-			#FIXME: huh?
-			types = {'host': farsight.CANDIDATE_TYPE_HOST,
-						'srflx': farsight.CANDIDATE_TYPE_SRFLX,
-						'prflx': farsight.CANDIDATE_TYPE_PRFLX,
-						'relay': farsight.CANDIDATE_TYPE_RELAY,
-						'multicast': farsight.CANDIDATE_TYPE_MULTICAST}
-			if 'type' in candidate and candidate['type'] in types:
-				cand.type = types[candidate['type']]
-			else:
-				print 'Unknown type %s', candidate['type']
-			candidates.append(cand)
-		#FIXME: connectivity should not be etablished yet
-		# Instead, it should be etablished after session-accept!
-		if len(candidates) > 0:
-			if self.sent:
-				self.p2pstream.set_remote_candidates(candidates)
-			else:
-				self.remote_candidates.extend(candidates)
-			#self.p2pstream.set_remote_candidates(candidates)
-			#print self.media, self.creator, self.name, candidates
-
-	def __content(self, payload=[]):
-		''' Build a XML content-wrapper for our data. '''
-		return xmpp.Node('content',
-			attrs={'name': self.name, 'creator': self.creator},
-			payload=payload)
-
-	def __candidate(self, candidate):
-		types = {farsight.CANDIDATE_TYPE_HOST: 'host',
-			farsight.CANDIDATE_TYPE_SRFLX: 'srflx',
-			farsight.CANDIDATE_TYPE_PRFLX: 'prflx',
-			farsight.CANDIDATE_TYPE_RELAY: 'relay',
-			farsight.CANDIDATE_TYPE_MULTICAST: 'multicast'}
-		attrs = {
-			'component': candidate.component_id,
-			'foundation': '1', # hack
-			'generation': '0',
-			'ip': candidate.ip,
-			'network': '0',
-			'port': candidate.port,
-			'priority': int(candidate.priority), # hack
-		}
-		if candidate.type in types:
-			attrs['type'] = types[candidate.type]
-		if candidate.proto == farsight.NETWORK_PROTOCOL_UDP:
-			attrs['protocol'] = 'udp'
-		else:
-			# we actually don't handle properly different tcp options in jingle
-			attrs['protocol'] = 'tcp'
-		return xmpp.Node('candidate', attrs=attrs)
-
-	def iter_candidates(self):
-		for candidate in self.candidates:
-			yield self.__candidate(candidate)
-
-	def send_candidate(self, candidate):
-		content = self.__content()
-		transport = content.addChild(xmpp.NS_JINGLE_ICE_UDP + ' transport')
-
-		if candidate.username and candidate.password:
-			transport['ufrag'] = candidate.username
-			transport['pwd'] = candidate.password
-
-		transport.addChild(node=self.__candidate(candidate))
-		self.session.send_transport_info(content)
-
-	def __fillJingleStanza(self, stanza, content, error, action):
-		''' Add our things to session-initiate stanza. '''
-		self._fillContent(content)
-
-		self.sent = True
-
-		if self.candidates and self.candidates[0].username and \
-		self.candidates[0].password:
-			attrs = {'ufrag': self.candidates[0].username,
-				'pwd': self.candidates[0].password}
-		else:
-			attrs = {}
-		content.addChild(xmpp.NS_JINGLE_ICE_UDP + ' transport', attrs=attrs,
-			payload=self.iter_candidates())
-
-	def destroy(self):
-		self.callbacks = None
-		del self.session.contents[(self.creator, self.name)]
-
-
-class JingleRTPContent(JingleContent):
-	def __init__(self, session, media, node=None):
-		JingleContent.__init__(self, session, node)
-		self.media = media
-		self._dtmf_running = False
-		self.farsight_media = {'audio': farsight.MEDIA_TYPE_AUDIO,
-								'video': farsight.MEDIA_TYPE_VIDEO}[media]
-		self.got_codecs = False
-
-		self.candidates_ready = False # True when local candidates are prepared
-
-		self.callbacks['session-initiate'] += [self.__getRemoteCodecsCB]
-		self.callbacks['content-add'] += [self.__getRemoteCodecsCB]
-		self.callbacks['content-accept'] += [self.__getRemoteCodecsCB,
-			self.__contentAcceptCB]
-		self.callbacks['session-accept'] += [self.__getRemoteCodecsCB,
-			self.__contentAcceptCB]
-		self.callbacks['session-accept-sent'] += [self.__contentAcceptCB]
-		self.callbacks['content-accept-sent'] += [self.__contentAcceptCB]
-		self.callbacks['session-terminate'] += [self.__stop]
-		self.callbacks['session-terminate-sent'] += [self.__stop]
-
-	def setup_stream(self):
-		# pipeline and bus
-		self.pipeline = gst.Pipeline()
-		bus = self.pipeline.get_bus()
-		bus.add_signal_watch()
-		bus.connect('message', self._on_gst_message)
-
-		# conference
-		self.conference = gst.element_factory_make('fsrtpconference')
-		self.conference.set_property("sdes-cname", self.session.ourjid)
-		self.pipeline.add(self.conference)
-		self.funnel = None
-
-		self.p2psession = self.conference.new_session(self.farsight_media)
-
-		participant = self.conference.new_participant(self.session.peerjid)
-		#FIXME: Consider a workaround, here... 
-		# pidgin and telepathy-gabble don't follow the XEP, and it won't work
-		# due to bad controlling-mode
-		params = {'controlling-mode': self.session.weinitiate,# 'debug': False}
-			'stun-ip': '69.0.208.27', 'debug': False}
-
-		self.p2pstream = self.p2psession.new_stream(participant,
-			farsight.DIRECTION_RECV, 'nice', params)
-
-	def batch_dtmf(self, events):
-		if self._dtmf_running:
-			raise Exception #TODO: Proper exception
-		self._dtmf_running = True
-		self._start_dtmf(events.pop(0))
-		gobject.timeout_add(500, self._next_dtmf, events)
-
-	def _next_dtmf(self, events):
-		self._stop_dtmf()
-		if events:
-			self._start_dtmf(events.pop(0))
-			gobject.timeout_add(500, self._next_dtmf, events)
-		else:
-			self._dtmf_running = False
-
-	def _start_dtmf(self, event):
-		if event in ('*', '#'):
-			event = {'*': farsight.DTMF_EVENT_STAR,
-				'#': farsight.DTMF_EVENT_POUND}[event]
-		else:
-			event = int(event)
-		self.p2psession.start_telephony_event(event, 2,
-			farsight.DTMF_METHOD_RTP_RFC4733)
-
-	def _stop_dtmf(self):
-		self.p2psession.stop_telephony_event(farsight.DTMF_METHOD_RTP_RFC4733)
-
-	def _fillContent(self, content):
-		content.addChild(xmpp.NS_JINGLE_RTP + ' description',
-			attrs={'media': self.media}, payload=self.iter_codecs())
-
-	def _setup_funnel(self):
-		self.funnel = gst.element_factory_make('fsfunnel')
-		self.pipeline.add(self.funnel)
-		self.funnel.set_state(gst.STATE_PLAYING)
-		self.sink.set_state(gst.STATE_PLAYING)
-		self.funnel.link(self.sink)
-
-	def _on_src_pad_added(self, stream, pad, codec):
-		if not self.funnel:
-			self._setup_funnel()
-		pad.link(self.funnel.get_pad('sink%d'))
-
-	def _on_gst_message(self, bus, message):
-		if message.type == gst.MESSAGE_ELEMENT:
-			name = message.structure.get_name()
-			if name == 'farsight-new-active-candidate-pair':
-				pass
-			elif name == 'farsight-recv-codecs-changed':
-				pass
-			elif name == 'farsight-codecs-changed':
-				if self.is_ready():
-					self.session.on_session_state_changed(self)
-				#TODO: description-info
-			elif name == 'farsight-local-candidates-prepared':
-				self.candidates_ready = True
-				if self.is_ready():
-					self.session.on_session_state_changed(self)
-			elif name == 'farsight-new-local-candidate':
-				candidate = message.structure['candidate']
-				self.candidates.append(candidate)
-				if self.candidates_ready:
-					#FIXME: Is this case even possible?
-					self.send_candidate(candidate)
-			elif name == 'farsight-component-state-changed':
-				state = message.structure['state']
-				print message.structure['component'], state
-				if state == farsight.STREAM_STATE_FAILED:
-					reason = xmpp.Node('reason')
-					reason.setTag('failed-transport')
-					self.session._session_terminate(reason)
-			elif name == 'farsight-error':
-				print 'Farsight error #%d!' % message.structure['error-no']
-				print 'Message: %s' % message.structure['error-msg']
-				print 'Debug: %s' % message.structure['debug-msg']
-			else:
-				print name
-
-	def __contentAcceptCB(self, stanza, content, error, action):
-		if self.accepted:
-			if len(self.remote_candidates) > 0:
-				self.p2pstream.set_remote_candidates(self.remote_candidates)
-				self.remote_candidates = []
-			#TODO: farsight.DIRECTION_BOTH only if senders='both'
-			self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH)
-			self.session.content_negociated(self.media)
-
-	def __getRemoteCodecsCB(self, stanza, content, error, action):
-		''' Get peer codecs from what we get from peer. '''
-		if self.got_codecs:
-			return
-
-		codecs = []
-		for codec in content.getTag('description').iterTags('payload-type'):
-			c = farsight.Codec(int(codec['id']), codec['name'],
-				self.farsight_media, int(codec['clockrate']))
-			if 'channels' in codec:
-				c.channels = int(codec['channels'])
-			else:
-				c.channels = 1
-			c.optional_params = [(str(p['name']), str(p['value'])) for p in \
-				codec.iterTags('parameter')]
-			codecs.append(c)
-
-		if len(codecs) > 0:
-			#FIXME: Handle this case:
-			# glib.GError: There was no intersection between the remote codecs and
-			# the local ones
-			self.p2pstream.set_remote_codecs(codecs)
-			self.got_codecs = True
-
-	def iter_codecs(self):
-		codecs = self.p2psession.get_property('codecs')
-		for codec in codecs:
-			attrs = {'name': codec.encoding_name,
-				'id': codec.id,
-				'channels': codec.channels}
-			if codec.clock_rate:
-				attrs['clockrate'] = codec.clock_rate
-			if codec.optional_params:
-				payload = (xmpp.Node('parameter', {'name': name, 'value': value})
-					for name, value in codec.optional_params)
-			else:	payload = ()
-			yield xmpp.Node('payload-type', attrs, payload)
-
-	def __stop(self, *things):
-		self.pipeline.set_state(gst.STATE_NULL)
-
-	def __del__(self):
-		self.__stop()
-
-	def destroy(self):
-		JingleContent.destroy(self)
-		self.p2pstream.disconnect_by_func(self._on_src_pad_added)
-		self.pipeline.get_bus().disconnect_by_func(self._on_gst_message)
-
-
-class JingleVoIP(JingleRTPContent):
-	''' Jingle VoIP sessions consist of audio content transported
-	over an ICE UDP protocol. '''
-	def __init__(self, session, node=None):
-		JingleRTPContent.__init__(self, session, 'audio', node)
-		self.setup_stream()
-
-
-	''' Things to control the gstreamer's pipeline '''
-	def setup_stream(self):
-		JingleRTPContent.setup_stream(self)
-
-		# Configure SPEEX
-		# Workaround for psi (not needed since rev
-		# 147aedcea39b43402fe64c533d1866a25449888a):
-		#  place 16kHz before 8kHz, as buggy psi versions will take in
-		#  account only the first codec
-
-		codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
-			farsight.MEDIA_TYPE_AUDIO, 16000),
-			farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
-			farsight.MEDIA_TYPE_AUDIO, 8000)]
-		self.p2psession.set_codec_preferences(codecs)
-
-		# the local parts
-		# TODO: use gconfaudiosink?
-		# sink = get_first_gst_element(['alsasink', 'osssink', 'autoaudiosink'])
-		self.sink = gst.element_factory_make('alsasink')
-		self.sink.set_property('sync', False)
-		#sink.set_property('latency-time', 20000)
-		#sink.set_property('buffer-time', 80000)
-
-		# TODO: use gconfaudiosrc?
-		src_mic = gst.element_factory_make('alsasrc')
-		src_mic.set_property('blocksize', 320)
-
-		self.mic_volume = gst.element_factory_make('volume')
-		self.mic_volume.set_property('volume', 1)
-
-		# link gst elements
-		self.pipeline.add(self.sink, src_mic, self.mic_volume)
-		src_mic.link(self.mic_volume)
-
-		self.mic_volume.get_pad('src').link(self.p2psession.get_property(
-			'sink-pad'))
-		self.p2pstream.connect('src-pad-added', self._on_src_pad_added)
-
-		# The following is needed for farsight to process ICE requests:
-		self.pipeline.set_state(gst.STATE_PLAYING)
-
-
-class JingleVideo(JingleRTPContent):
-	def __init__(self, session, node=None):
-		JingleRTPContent.__init__(self, session, 'video', node)
-		self.setup_stream()
-
-	''' Things to control the gstreamer's pipeline '''
-	def setup_stream(self):
-		#TODO: Everything is not working properly:
-		# sometimes, one window won't show up,
-		# sometimes it'll freeze...
-		JingleRTPContent.setup_stream(self)
-		# the local parts
-		src_vid = gst.element_factory_make('videotestsrc')
-		src_vid.set_property('is-live', True)
-		videoscale = gst.element_factory_make('videoscale')
-		caps = gst.element_factory_make('capsfilter')
-		caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240'))
-		colorspace = gst.element_factory_make('ffmpegcolorspace')
-
-		self.pipeline.add(src_vid, videoscale, caps, colorspace)
-		gst.element_link_many(src_vid, videoscale, caps, colorspace)
-
-		self.sink = gst.element_factory_make('xvimagesink')
-		self.pipeline.add(self.sink)
-
-		colorspace.get_pad('src').link(self.p2psession.get_property('sink-pad'))
-		self.p2pstream.connect('src-pad-added', self._on_src_pad_added)
-
-		# The following is needed for farsight to process ICE requests:
-		self.pipeline.set_state(gst.STATE_PLAYING)
+from jingle_session import JingleSession
+from jingle_rtp import JingleAudio, JingleVideo
 
 
 class ConnectionJingle(object):
-	''' This object depends on that it is a part of Connection class. '''
+	"""
+	This object depends on that it is a part of Connection class.
+	"""
+
 	def __init__(self):
 		# dictionary: (jid, sessionid) => JingleSession object
 		self.__sessions = {}
@@ -1107,13 +51,17 @@ class ConnectionJingle(object):
 		self.__iq_responses = {}
 
 	def add_jingle(self, jingle):
-		''' Add a jingle session to a jingle stanza dispatcher
+		"""
+		Add a jingle session to a jingle stanza dispatcher
+
 		jingle - a JingleSession object.
-		'''
+		"""
 		self.__sessions[(jingle.peerjid, jingle.sid)] = jingle
 
 	def delete_jingle_session(self, peerjid, sid):
-		''' Remove a jingle session from a jingle stanza dispatcher '''
+		"""
+		Remove a jingle session from a jingle stanza dispatcher
+		"""
 		key = (peerjid, sid)
 		if key in self.__sessions:
 			#FIXME: Move this elsewhere?
@@ -1123,18 +71,21 @@ class ConnectionJingle(object):
 			del self.__sessions[key]
 
 	def _JingleCB(self, con, stanza):
-		''' The jingle stanza dispatcher.
-		Route jingle stanza to proper JingleSession object,
-		or create one if it is a new session.
-		TODO: Also check if the stanza isn't an error stanza, if so
-		route it adequatelly.'''
+		"""
+		The jingle stanza dispatcher
 
+		Route jingle stanza to proper JingleSession object, or create one if it
+		is a new session.
+
+		TODO: Also check if the stanza isn't an error stanza, if so route it
+		adequatelly.
+		"""
 		# get data
 		jid = helpers.get_full_jid_from_iq(stanza)
 		id = stanza.getID()
 
 		if (jid, id) in self.__iq_responses.keys():
-			self.__iq_responses[(jid, id)].stanzaCB(stanza)
+			self.__iq_responses[(jid, id)].on_stanza(stanza)
 			del self.__iq_responses[(jid, id)]
 			raise xmpp.NodeProcessed
 
@@ -1149,24 +100,24 @@ class ConnectionJingle(object):
 			self.add_jingle(newjingle)
 
 		# we already have such session in dispatcher...
-		self.__sessions[(jid, sid)].stanzaCB(stanza)
+		self.__sessions[(jid, sid)].on_stanza(stanza)
 
 		raise xmpp.NodeProcessed
 
-	def startVoIP(self, jid):
+	def start_audio(self, jid):
 		if self.get_jingle_session(jid, media='audio'):
 			return self.get_jingle_session(jid, media='audio').sid
 		jingle = self.get_jingle_session(jid, media='video')
 		if jingle:
-			jingle.add_content('voice', JingleVoIP(jingle))
+			jingle.add_content('voice', JingleAudio(jingle))
 		else:
 			jingle = JingleSession(self, weinitiate=True, jid=jid)
 			self.add_jingle(jingle)
-			jingle.add_content('voice', JingleVoIP(jingle))
+			jingle.add_content('voice', JingleAudio(jingle))
 			jingle.start_session()
 		return jingle.sid
 
-	def startVideoIP(self, jid):
+	def start_video(self, jid):
 		if self.get_jingle_session(jid, media='video'):
 			return self.get_jingle_session(jid, media='video').sid
 		jingle = self.get_jingle_session(jid, media='audio')
@@ -1193,3 +144,5 @@ class ConnectionJingle(object):
 					return session
 
 		return None
+
+# vim: se ts=3:
+\ No newline at end of file
diff --git a/src/common/jingle_content.py b/src/common/jingle_content.py
new file mode 100644
index 000000000..7b0e3f8fe
--- /dev/null
+++ b/src/common/jingle_content.py
@@ -0,0 +1,142 @@
+##
+## Copyright (C) 2006 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; version 2 only.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+"""
+Handles Jingle contents (XEP 0166)
+"""
+
+import xmpp
+
+contents = {}
+
+def get_jingle_content(node):
+	namespace = node.getNamespace()
+	if namespace in contents:
+		return contents[namespace](node)
+
+
+class JingleContentSetupException(Exception):
+	"""
+	Exception that should be raised when a content fails to setup.
+	"""
+
+
+class JingleContent(object):
+	"""
+	An abstraction of content in Jingle sessions
+	"""
+
+	def __init__(self, session, transport):
+		self.session = session
+		self.transport = transport
+		# will be filled by JingleSession.add_content()
+		# don't uncomment these lines, we will catch more buggy code then
+		# (a JingleContent not added to session shouldn't send anything)
+		#self.creator = None
+		#self.name = None
+		self.accepted = False
+		self.sent = False
+		self.negotiated = False
+
+		self.media = None
+
+		self.senders = 'both' #FIXME
+		self.allow_sending = True # Used for stream direction, attribute 'senders'
+
+		self.callbacks = {
+			# these are called when *we* get stanzas
+			'content-accept': [self.__on_transport_info],
+			'content-add': [self.__on_transport_info],
+			'content-modify': [],
+			'content-reject': [],
+			'content-remove': [],
+			'description-info': [],
+			'security-info': [],
+			'session-accept': [self.__on_transport_info],
+			'session-info': [],
+			'session-initiate': [self.__on_transport_info],
+			'session-terminate': [],
+			'transport-info': [self.__on_transport_info],
+			'transport-replace': [],
+			'transport-accept': [],
+			'transport-reject': [],
+			'iq-result': [],
+			'iq-error': [],
+			# these are called when *we* sent these stanzas
+			'content-accept-sent': [self.__fill_jingle_stanza],
+			'content-add-sent': [self.__fill_jingle_stanza],
+			'session-initiate-sent': [self.__fill_jingle_stanza],
+			'session-accept-sent': [self.__fill_jingle_stanza],
+			'session-terminate-sent': [],
+		}
+
+	def is_ready(self):
+		return self.accepted and not self.sent
+
+	def on_negotiated(self):
+		if self.accepted:
+			self.negotiated = True
+			self.session.content_negotiated(self.media)
+
+	def add_remote_candidates(self, candidates):
+		"""
+		Add a list of candidates to the list of remote candidates
+		"""
+		pass
+
+	def on_stanza(self, stanza, content, error, action):
+		"""
+		Called when something related to our content was sent by peer
+		"""
+		if action in self.callbacks:
+			for callback in self.callbacks[action]:
+				callback(stanza, content, error, action)
+
+	def __on_transport_info(self, stanza, content, error, action):
+		"""
+		Got a new transport candidate
+		"""
+		candidates = self.transport.parse_transport_stanza(
+			content.getTag('transport'))
+		if candidates:
+			self.add_remote_candidates(candidates)
+
+	def __content(self, payload=[]):
+		"""
+		Build a XML content-wrapper for our data
+		"""
+		return xmpp.Node('content',
+			attrs={'name': self.name, 'creator': self.creator},
+			payload=payload)
+
+	def send_candidate(self, candidate):
+		"""
+		Send a transport candidate for a previously defined transport.
+		"""
+		content = self.__content()
+		content.addChild(node=self.transport.make_transport([candidate]))
+		self.session.send_transport_info(content)
+
+	def __fill_jingle_stanza(self, stanza, content, error, action):
+		"""
+		Add our things to session-initiate stanza
+		"""
+		self._fill_content(content)
+		self.sent = True
+		content.addChild(node=self.transport.make_transport())
+
+	def destroy(self):
+		self.callbacks = None
+		del self.session.contents[(self.creator, self.name)]
+
+# vim: se ts=3:
diff --git a/src/common/jingle_rtp.py b/src/common/jingle_rtp.py
new file mode 100644
index 000000000..ce37370f4
--- /dev/null
+++ b/src/common/jingle_rtp.py
@@ -0,0 +1,353 @@
+##
+## Copyright (C) 2006 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; version 2 only.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+"""
+Handles Jingle RTP sessions (XEP 0167)
+"""
+
+import gobject
+import socket
+
+import xmpp
+import farsight, gst
+from glib import GError
+
+import gajim
+
+from jingle_transport import JingleTransportICEUDP
+from jingle_content import contents, JingleContent, JingleContentSetupException
+
+
+class JingleRTPContent(JingleContent):
+	def __init__(self, session, media, transport=None):
+		if transport is None:
+			transport = JingleTransportICEUDP()
+		JingleContent.__init__(self, session, transport)
+		self.media = media
+		self._dtmf_running = False
+		self.farsight_media = {'audio': farsight.MEDIA_TYPE_AUDIO,
+								'video': farsight.MEDIA_TYPE_VIDEO}[media]
+
+		self.candidates_ready = False # True when local candidates are prepared
+
+		self.callbacks['session-initiate'] += [self.__on_remote_codecs]
+		self.callbacks['content-add'] += [self.__on_remote_codecs]
+		self.callbacks['description-info'] += [self.__on_remote_codecs]
+		self.callbacks['content-accept'] += [self.__on_remote_codecs,
+			self.__on_content_accept]
+		self.callbacks['session-accept'] += [self.__on_remote_codecs,
+			self.__on_content_accept]
+		self.callbacks['session-accept-sent'] += [self.__on_content_accept]
+		self.callbacks['content-accept-sent'] += [self.__on_content_accept]
+		self.callbacks['session-terminate'] += [self.__stop]
+		self.callbacks['session-terminate-sent'] += [self.__stop]
+
+	def setup_stream(self):
+		# pipeline and bus
+		self.pipeline = gst.Pipeline()
+		bus = self.pipeline.get_bus()
+		bus.add_signal_watch()
+		bus.connect('message', self._on_gst_message)
+
+		# conference
+		self.conference = gst.element_factory_make('fsrtpconference')
+		self.conference.set_property('sdes-cname', self.session.ourjid)
+		self.pipeline.add(self.conference)
+		self.funnel = None
+
+		self.p2psession = self.conference.new_session(self.farsight_media)
+
+		participant = self.conference.new_participant(self.session.peerjid)
+		# FIXME: Consider a workaround, here...
+		# pidgin and telepathy-gabble don't follow the XEP, and it won't work
+		# due to bad controlling-mode
+		params = {'controlling-mode': self.session.weinitiate, 'debug': False}
+		if gajim.config.get('use_stun_server'):
+			stun_server = gajim.config.get('stun_server')
+			if not stun_server and self.session.connection._stun_servers:
+				stun_server = self.session.connection._stun_servers[0]['host']
+			if stun_server:
+				try:
+					ip = socket.getaddrinfo(stun_server, 0, socket.AF_UNSPEC,
+						socket.SOCK_STREAM)[0][4][0]
+				except socket.gaierror, (errnum, errstr):
+					log.warn('Lookup of stun ip failed: %s' % errstr)
+				else:
+					params['stun-ip'] = ip
+
+		self.p2pstream = self.p2psession.new_stream(participant,
+			farsight.DIRECTION_RECV, 'nice', params)
+
+	def is_ready(self):
+		return (JingleContent.is_ready(self) and self.candidates_ready
+			and self.p2psession.get_property('codecs-ready'))
+
+	def make_bin_from_config(self, config_key, pipeline, text):
+		pipeline = pipeline % gajim.config.get(config_key)
+		try:
+			bin = gst.parse_bin_from_description(pipeline, True)
+			return bin
+		except GError, error_str:
+			self.session.connection.dispatch('ERROR',
+				(_("%s configuration error") % text.capitalize(),
+					_("Couldn't setup %s. Check your configuration.\n\n"
+						"Pipeline was:\n%s\n\n"
+						"Error was:\n%s") % (text, pipeline, error_str)))
+			raise JingleContentSetupException
+
+	def add_remote_candidates(self, candidates):
+		JingleContent.add_remote_candidates(self, candidates)
+		# FIXME: connectivity should not be etablished yet
+		# Instead, it should be etablished after session-accept!
+		if self.sent:
+			self.p2pstream.set_remote_candidates(candidates)
+
+	def batch_dtmf(self, events):
+		"""
+		Send several DTMF tones
+		"""
+		if self._dtmf_running:
+			raise Exception # TODO: Proper exception
+		self._dtmf_running = True
+		self._start_dtmf(events.pop(0))
+		gobject.timeout_add(500, self._next_dtmf, events)
+
+	def _next_dtmf(self, events):
+		self._stop_dtmf()
+		if events:
+			self._start_dtmf(events.pop(0))
+			gobject.timeout_add(500, self._next_dtmf, events)
+		else:
+			self._dtmf_running = False
+
+	def _start_dtmf(self, event):
+		if event in ('*', '#'):
+			event = {'*': farsight.DTMF_EVENT_STAR,
+				'#': farsight.DTMF_EVENT_POUND}[event]
+		else:
+			event = int(event)
+		self.p2psession.start_telephony_event(event, 2,
+			farsight.DTMF_METHOD_RTP_RFC4733)
+
+	def _stop_dtmf(self):
+		self.p2psession.stop_telephony_event(farsight.DTMF_METHOD_RTP_RFC4733)
+
+	def _fill_content(self, content):
+		content.addChild(xmpp.NS_JINGLE_RTP + ' description',
+			attrs={'media': self.media}, payload=self.iter_codecs())
+
+	def _setup_funnel(self):
+		self.funnel = gst.element_factory_make('fsfunnel')
+		self.pipeline.add(self.funnel)
+		self.funnel.set_state(gst.STATE_PLAYING)
+		self.sink.set_state(gst.STATE_PLAYING)
+		self.funnel.link(self.sink)
+
+	def _on_src_pad_added(self, stream, pad, codec):
+		if not self.funnel:
+			self._setup_funnel()
+		pad.link(self.funnel.get_pad('sink%d'))
+
+	def _on_gst_message(self, bus, message):
+		if message.type == gst.MESSAGE_ELEMENT:
+			name = message.structure.get_name()
+			if name == 'farsight-new-active-candidate-pair':
+				pass
+			elif name == 'farsight-recv-codecs-changed':
+				pass
+			elif name == 'farsight-codecs-changed':
+				if self.is_ready():
+					self.session.on_session_state_changed(self)
+				# TODO: description-info
+			elif name == 'farsight-local-candidates-prepared':
+				self.candidates_ready = True
+				if self.is_ready():
+					self.session.on_session_state_changed(self)
+			elif name == 'farsight-new-local-candidate':
+				candidate = message.structure['candidate']
+				self.transport.candidates.append(candidate)
+				if self.candidates_ready:
+					# FIXME: Is this case even possible?
+					self.send_candidate(candidate)
+			elif name == 'farsight-component-state-changed':
+				state = message.structure['state']
+				print message.structure['component'], state
+				if state == farsight.STREAM_STATE_FAILED:
+					reason = xmpp.Node('reason')
+					reason.setTag('failed-transport')
+					self.session._session_terminate(reason)
+			elif name == 'farsight-error':
+				print 'Farsight error #%d!' % message.structure['error-no']
+				print 'Message: %s' % message.structure['error-msg']
+				print 'Debug: %s' % message.structure['debug-msg']
+			else:
+				print name
+
+	def __on_content_accept(self, stanza, content, error, action):
+		if self.accepted:
+			if self.transport.remote_candidates:
+				self.p2pstream.set_remote_candidates(self.transport.remote_candidates)
+				self.transport.remote_candidates = []
+			# TODO: farsight.DIRECTION_BOTH only if senders='both'
+			self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH)
+		self.on_negotiated()
+
+	def __on_remote_codecs(self, stanza, content, error, action):
+		"""
+		Get peer codecs from what we get from peer
+		"""
+
+		codecs = []
+		for codec in content.getTag('description').iterTags('payload-type'):
+			c = farsight.Codec(int(codec['id']), codec['name'],
+				self.farsight_media, int(codec['clockrate']))
+			if 'channels' in codec:
+				c.channels = int(codec['channels'])
+			else:
+				c.channels = 1
+			c.optional_params = [(str(p['name']), str(p['value'])) for p in \
+				codec.iterTags('parameter')]
+			codecs.append(c)
+
+		if codecs:
+			# FIXME: Handle this case:
+			# glib.GError: There was no intersection between the remote codecs and
+			# the local ones
+			self.p2pstream.set_remote_codecs(codecs)
+
+	def iter_codecs(self):
+		codecs = self.p2psession.get_property('codecs')
+		for codec in codecs:
+			attrs = {'name': codec.encoding_name,
+				'id': codec.id,
+				'channels': codec.channels}
+			if codec.clock_rate:
+				attrs['clockrate'] = codec.clock_rate
+			if codec.optional_params:
+				payload = (xmpp.Node('parameter', {'name': name, 'value': value})
+					for name, value in codec.optional_params)
+			else:
+				payload = ()
+			yield xmpp.Node('payload-type', attrs, payload)
+
+	def __stop(self, *things):
+		self.pipeline.set_state(gst.STATE_NULL)
+
+	def __del__(self):
+		self.__stop()
+
+	def destroy(self):
+		JingleContent.destroy(self)
+		self.p2pstream.disconnect_by_func(self._on_src_pad_added)
+		self.pipeline.get_bus().disconnect_by_func(self._on_gst_message)
+
+
+class JingleAudio(JingleRTPContent):
+	"""
+	Jingle VoIP sessions consist of audio content transported over an ICE UDP
+	protocol
+	"""
+
+	def __init__(self, session, transport=None):
+		JingleRTPContent.__init__(self, session, 'audio', transport)
+		self.setup_stream()
+
+	def set_mic_volume(self, vol):
+		"""
+		vol must be between 0 ans 1
+		"""
+		self.mic_volume.set_property('volume', vol)
+
+	def set_out_volume(self, vol):
+		"""
+		vol must be between 0 ans 1
+		"""
+		self.out_volume.set_property('volume', vol)
+
+	def setup_stream(self):
+		JingleRTPContent.setup_stream(self)
+
+		# Configure SPEEX
+		# Workaround for psi (not needed since rev
+		# 147aedcea39b43402fe64c533d1866a25449888a):
+		#  place 16kHz before 8kHz, as buggy psi versions will take in
+		#  account only the first codec
+
+		codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
+			farsight.MEDIA_TYPE_AUDIO, 16000),
+			farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
+			farsight.MEDIA_TYPE_AUDIO, 8000)]
+		self.p2psession.set_codec_preferences(codecs)
+
+		# the local parts
+		# TODO: Add queues?
+		src_bin = self.make_bin_from_config('audio_input_device',
+			'%s ! audioconvert', _("audio input"))
+
+		self.sink = self.make_bin_from_config('audio_output_device',
+			'audioconvert ! volume name=gajim_out_vol ! %s', _("audio output"))
+
+		self.mic_volume = src_bin.get_by_name('gajim_vol')
+		self.out_volume = self.sink.get_by_name('gajim_out_vol')
+
+		# link gst elements
+		self.pipeline.add(self.sink, src_bin)
+
+		src_bin.get_pad('src').link(self.p2psession.get_property(
+			'sink-pad'))
+		self.p2pstream.connect('src-pad-added', self._on_src_pad_added)
+
+		# The following is needed for farsight to process ICE requests:
+		self.pipeline.set_state(gst.STATE_PLAYING)
+
+
+class JingleVideo(JingleRTPContent):
+	def __init__(self, session, transport=None):
+		JingleRTPContent.__init__(self, session, 'video', transport)
+		self.setup_stream()
+
+	def setup_stream(self):
+		# TODO: Everything is not working properly:
+		# sometimes, one window won't show up,
+		# sometimes it'll freeze...
+		JingleRTPContent.setup_stream(self)
+
+		# the local parts
+		src_bin = self.make_bin_from_config('video_input_device',
+			'%s ! videoscale ! ffmpegcolorspace', _("video input"))
+		#caps = gst.element_factory_make('capsfilter')
+		#caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240'))
+
+		self.pipeline.add(src_bin)#, caps)
+		#src_bin.link(caps)
+
+		self.sink = self.make_bin_from_config('video_output_device',
+			'videoscale ! ffmpegcolorspace ! %s', _("video output"))
+		self.pipeline.add(self.sink)
+
+		src_bin.get_pad('src').link(self.p2psession.get_property('sink-pad'))
+		self.p2pstream.connect('src-pad-added', self._on_src_pad_added)
+
+		# The following is needed for farsight to process ICE requests:
+		self.pipeline.set_state(gst.STATE_PLAYING)
+
+
+def get_content(desc):
+	if desc['media'] == 'audio':
+		return JingleAudio
+	elif desc['media'] == 'video':
+		return JingleVideo
+
+contents[xmpp.NS_JINGLE_RTP] = get_content
+
+# vim: se ts=3:
diff --git a/src/common/jingle_session.py b/src/common/jingle_session.py
new file mode 100644
index 000000000..3e2392739
--- /dev/null
+++ b/src/common/jingle_session.py
@@ -0,0 +1,656 @@
+##
+## Copyright (C) 2006 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; version 2 only.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+"""
+Handles Jingle sessions (XEP 0166)
+"""
+
+#TODO:
+# * 'senders' attribute of 'content' element
+# * security preconditions
+# * actions:
+#   - content-modify
+#   - session-info
+#   - security-info
+#   - transport-accept, transport-reject
+#   - Tie-breaking
+# * timeout
+
+import gajim #Get rid of that?
+import xmpp
+from jingle_transport import get_jingle_transport
+from jingle_content import get_jingle_content, JingleContentSetupException
+
+# FIXME: Move it to JingleSession.States?
+class JingleStates(object):
+	"""
+	States in which jingle session may exist
+	"""
+	ended = 0
+	pending = 1
+	active = 2
+
+class OutOfOrder(Exception):
+	"""
+	Exception that should be raised when an action is received when in the wrong
+	state
+	"""
+
+class TieBreak(Exception):
+	"""
+	Exception that should be raised in case of a tie, when we overrule the other
+	action
+	"""
+
+class JingleSession(object):
+	"""
+	This represents one jingle session, that is, one or more content types
+	negotiated between an initiator and a responder.
+	"""
+
+	def __init__(self, con, weinitiate, jid, sid=None):
+		"""
+		con -- connection object,
+		weinitiate -- boolean, are we the initiator?
+		jid - jid of the other entity
+		"""
+		self.contents = {} # negotiated contents
+		self.connection = con # connection to use
+		# our full jid
+		#FIXME: Get rid of gajim here?
+		self.ourjid = gajim.get_jid_from_account(self.connection.name) + '/' + \
+			con.server_resource
+		self.peerjid = jid # jid we connect to
+		# jid we use as the initiator
+		self.initiator = weinitiate and self.ourjid or self.peerjid
+		# jid we use as the responder
+		self.responder = weinitiate and self.peerjid or self.ourjid
+		# are we an initiator?
+		self.weinitiate = weinitiate
+		# what state is session in? (one from JingleStates)
+		self.state = JingleStates.ended
+		if not sid:
+			sid = con.connection.getAnID()
+		self.sid = sid # sessionid
+
+		self.accepted = True # is this session accepted by user
+
+		# callbacks to call on proper contents
+		# use .prepend() to add new callbacks, especially when you're going
+		# to send error instead of ack
+		self.callbacks = {
+			'content-accept':	[self.__on_content_accept, self.__broadcast,
+				self.__ack],
+			'content-add':		[self.__on_content_add, self.__broadcast,
+				self.__ack], #TODO
+			'content-modify':	[self.__ack], #TODO
+			'content-reject':	[self.__ack, self.__on_content_remove], #TODO
+			'content-remove':	[self.__ack, self.__on_content_remove],
+			'description-info':	[self.__broadcast, self.__ack], #TODO
+			'security-info':	[self.__ack], #TODO
+			'session-accept':	[self.__on_session_accept, self.__on_content_accept,
+				self.__broadcast, self.__ack],
+			'session-info':		[self.__broadcast, self.__on_session_info, self.__ack],
+			'session-initiate':	[self.__on_session_initiate, self.__broadcast,
+				self.__ack],
+			'session-terminate':	[self.__on_session_terminate, self.__broadcast_all,
+				self.__ack],
+			'transport-info':	[self.__broadcast, self.__ack],
+			'transport-replace':	[self.__broadcast, self.__on_transport_replace], #TODO
+			'transport-accept':	[self.__ack], #TODO
+			'transport-reject':	[self.__ack], #TODO
+			'iq-result':		[],
+			'iq-error':		[self.__on_error],
+		}
+
+	def approve_session(self):
+		"""
+		Called when user accepts session in UI (when we aren't the initiator)
+		"""
+		self.accept_session()
+
+	def decline_session(self):
+		"""
+		Called when user declines session in UI (when we aren't the initiator)
+		"""
+		reason = xmpp.Node('reason')
+		reason.addChild('decline')
+		self._session_terminate(reason)
+
+	def approve_content(self, media):
+		content = self.get_content(media)
+		if content:
+			content.accepted = True
+			self.on_session_state_changed(content)
+
+	def reject_content(self, media):
+		content = self.get_content(media)
+		if content:
+			if self.state == JingleStates.active:
+				self.__content_reject(content)
+			content.destroy()
+			self.on_session_state_changed()
+
+	def end_session(self):
+		"""
+		Called when user stops or cancel session in UI
+		"""
+		reason = xmpp.Node('reason')
+		if self.state == JingleStates.active:
+			reason.addChild('success')
+		else:
+			reason.addChild('cancel')
+		self._session_terminate(reason)
+
+	def get_content(self, media=None):
+		if media is None:
+			return
+
+		for content in self.contents.values():
+			if content.media == media:
+				return content
+
+	def add_content(self, name, content, creator='we'):
+		"""
+		Add new content to session. If the session is active, this will send
+		proper stanza to update session
+
+		Creator must be one of ('we', 'peer', 'initiator', 'responder')
+		"""
+		assert creator in ('we', 'peer', 'initiator', 'responder')
+
+		if (creator == 'we' and self.weinitiate) or (creator == 'peer' and \
+		not self.weinitiate):
+			creator = 'initiator'
+		elif (creator == 'peer' and self.weinitiate) or (creator == 'we' and \
+		not self.weinitiate):
+			creator = 'responder'
+		content.creator = creator
+		content.name = name
+		self.contents[(creator, name)] = content
+
+		if (creator == 'initiator') == self.weinitiate:
+			# The content is from us, accept it
+			content.accepted = True
+
+	def remove_content(self, creator, name):
+		"""
+		We do not need this now
+		"""
+		#TODO:
+		if (creator, name) in self.contents:
+			content = self.contents[(creator, name)]
+			if len(self.contents) > 1:
+				self.__content_remove(content)
+			self.contents[(creator, name)].destroy()
+		if len(self.contents) == 0:
+			self.end_session()
+
+	def modify_content(self, creator, name, *someother):
+		"""
+		We do not need this now
+		"""
+		pass
+
+	def on_session_state_changed(self, content=None):
+		if self.state == JingleStates.ended:
+			# Session not yet started, only one action possible: session-initiate
+			if self.is_ready() and self.weinitiate:
+				self.__session_initiate()
+		elif self.state == JingleStates.pending:
+			# We can either send a session-accept or a content-add
+			if self.is_ready() and not self.weinitiate:
+				self.__session_accept()
+			elif content and (content.creator == 'initiator') == self.weinitiate:
+				self.__content_add(content)
+			elif content and self.weinitiate:
+				self.__content_accept(content)
+		elif self.state == JingleStates.active:
+			# We can either send a content-add or a content-accept
+			if not content:
+				return
+			if (content.creator == 'initiator') == self.weinitiate:
+				# We initiated this content. It's a pending content-add.
+				self.__content_add(content)
+			else:
+				# The other side created this content, we accept it.
+				self.__content_accept(content)
+
+	def is_ready(self):
+		"""
+		Return True when all codecs and candidates are ready (for all contents)
+		"""
+		return (all((content.is_ready() for content in self.contents.itervalues()))
+			and self.accepted)
+
+	def accept_session(self):
+		"""
+		Mark the session as accepted
+		"""
+		self.accepted = True
+		self.on_session_state_changed()
+
+	def start_session(self):
+		"""
+		Mark the session as ready to be started
+		"""
+		self.accepted = True
+		self.on_session_state_changed()
+
+	def send_session_info(self):
+		pass
+
+	def send_content_accept(self, content):
+		assert self.state != JingleStates.ended
+		stanza, jingle = self.__make_jingle('content-accept')
+		jingle.addChild(node=content)
+		self.connection.connection.send(stanza)
+
+	def send_transport_info(self, content):
+		assert self.state != JingleStates.ended
+		stanza, jingle = self.__make_jingle('transport-info')
+		jingle.addChild(node=content)
+		self.connection.connection.send(stanza)
+
+	def on_stanza(self, stanza):
+		"""
+		A callback for ConnectionJingle. It gets stanza, then tries to send it to
+		all internally registered callbacks. First one to raise
+		xmpp.NodeProcessed breaks function
+		"""
+		jingle = stanza.getTag('jingle')
+		error = stanza.getTag('error')
+		if error:
+			# it's an iq-error stanza
+			action = 'iq-error'
+		elif jingle:
+			# it's a jingle action
+			action = jingle.getAttr('action')
+			if action not in self.callbacks:
+				self.__send_error(stanza, 'bad_request')
+				return
+			# FIXME: If we aren't initiated and it's not a session-initiate...
+			if action != 'session-initiate' and self.state == JingleStates.ended:
+				self.__send_error(stanza, 'item-not-found', 'unknown-session')
+				return
+		else:
+			# it's an iq-result (ack) stanza
+			action = 'iq-result'
+
+		callables = self.callbacks[action]
+
+		try:
+			for callable in callables:
+				callable(stanza=stanza, jingle=jingle, error=error, action=action)
+		except xmpp.NodeProcessed:
+			pass
+		except TieBreak:
+			self.__send_error(stanza, 'conflict', 'tiebreak')
+		except OutOfOrder:
+			# FIXME
+			self.__send_error(stanza, 'unexpected-request', 'out-of-order')
+
+	def __ack(self, stanza, jingle, error, action):
+		"""
+		Default callback for action stanzas -- simple ack and stop processing
+		"""
+		response = stanza.buildReply('result')
+		self.connection.connection.send(response)
+
+	def __on_error(self, stanza, jingle, error, action):
+		# FIXME
+		text = error.getTagData('text')
+		jingle_error = None
+		xmpp_error = None
+		for child in error.getChildren():
+			if child.getNamespace() == xmpp.NS_JINGLE_ERRORS:
+				jingle_error = child.getName()
+			elif child.getNamespace() == xmpp.NS_STANZAS:
+				xmpp_error = child.getName()
+		self.__dispatch_error(xmpp_error, jingle_error, text)
+		# FIXME: Not sure when we would want to do that...
+		if xmpp_error == 'item-not-found':
+			self.connection.delete_jingle_session(self.peerjid, self.sid)
+
+	def __on_transport_replace(self, stanza, jingle, error, action):
+		for content in jingle.iterTags('content'):
+			creator = content['creator']
+			name = content['name']
+			if (creator, name) in self.contents:
+				transport_ns = content.getTag('transport').getNamespace()
+				if transport_ns == xmpp.JINGLE_ICE_UDP:
+					# FIXME: We don't manage anything else than ICE-UDP now...
+					# What was the previous transport?!?
+					# Anyway, content's transport is not modifiable yet
+					pass
+				else:
+					stanza, jingle = self.__make_jingle('transport-reject')
+					content = jingle.setTag('content', attrs={'creator': creator,
+						'name': name})
+					content.setTag('transport', namespace=transport_ns)
+					self.connection.connection.send(stanza)
+					raise xmpp.NodeProcessed
+			else:
+				# FIXME: This ressource is unknown to us, what should we do?
+				# For now, reject the transport
+				stanza, jingle = self.__make_jingle('transport-reject')
+				c = jingle.setTag('content', attrs={'creator': creator,
+					'name': name})
+				c.setTag('transport', namespace=transport_ns)
+				self.connection.connection.send(stanza)
+				raise xmpp.NodeProcessed
+
+	def __on_session_info(self, stanza, jingle, error, action):
+		# TODO: ringing, active, (un)hold, (un)mute
+		payload = jingle.getPayload()
+		if payload:
+			self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info')
+			raise xmpp.NodeProcessed
+
+	def __on_content_remove(self, stanza, jingle, error, action):
+		for content in jingle.iterTags('content'):
+			creator = content['creator']
+			name = content['name']
+			if (creator, name) in self.contents:
+				content = self.contents[(creator, name)]
+				# TODO: this will fail if content is not an RTP content
+				self.connection.dispatch('JINGLE_DISCONNECTED',
+					(self.peerjid, self.sid, content.media, 'removed'))
+				content.destroy()
+		if not self.contents:
+			reason = xmpp.Node('reason')
+			reason.setTag('success')
+			self._session_terminate(reason)
+
+	def __on_session_accept(self, stanza, jingle, error, action):
+		# FIXME
+		if self.state != JingleStates.pending:
+			raise OutOfOrder
+		self.state = JingleStates.active
+
+	def __on_content_accept(self, stanza, jingle, error, action):
+		"""
+		Called when we get content-accept stanza or equivalent one (like
+		session-accept)
+		"""
+		# check which contents are accepted
+		for content in jingle.iterTags('content'):
+			creator = content['creator']
+			# TODO
+			name = content['name']
+
+	def __on_content_add(self, stanza, jingle, error, action):
+		if self.state == JingleStates.ended:
+			raise OutOfOrder
+
+		parse_result = self.__parse_contents(jingle)
+		contents = parse_result[0]
+		rejected_contents = parse_result[1]
+
+		for name, creator in rejected_contents:
+			# TODO
+			content = JingleContent()
+			self.add_content(name, content, creator)
+			self.__content_reject(content)
+			self.contents[(content.creator, content.name)].destroy()
+
+		self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid,
+			contents))
+
+	def __on_session_initiate(self, stanza, jingle, error, action):
+		"""
+		We got a jingle session request from other entity, therefore we are the
+		receiver... Unpack the data, inform the user
+		"""
+		if self.state != JingleStates.ended:
+			raise OutOfOrder
+
+		self.initiator = jingle['initiator']
+		self.responder = self.ourjid
+		self.peerjid = self.initiator
+		self.accepted = False	# user did not accept this session yet
+
+		# TODO: If the initiator is unknown to the receiver (e.g., via presence
+		# subscription) and the receiver has a policy of not communicating via
+		# Jingle with unknown entities, it SHOULD return a <service-unavailable/>
+		# error.
+
+		# Lets check what kind of jingle session does the peer want
+		contents, contents_rejected, reason = self.__parse_contents(jingle)
+
+		# If there's no content we understand...
+		if not contents:
+			# TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate
+			reason = xmpp.Node('reason')
+			reason.setTag(reason)
+			self.__ack(stanza, jingle, error, action)
+			self._session_terminate(reason)
+			raise xmpp.NodeProcessed
+
+		self.state = JingleStates.pending
+
+		# Send event about starting a session
+		self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid,
+			contents))
+
+	def __broadcast(self, stanza, jingle, error, action):
+		"""
+		Broadcast the stanza contents to proper content handlers
+		"""
+		for content in jingle.iterTags('content'):
+			name = content['name']
+			creator = content['creator']
+			cn = self.contents[(creator, name)]
+			cn.on_stanza(stanza, content, error, action)
+
+	def __on_session_terminate(self, stanza, jingle, error, action):
+		self.connection.delete_jingle_session(self.peerjid, self.sid)
+		reason, text = self.__reason_from_stanza(jingle)
+		if reason not in ('success', 'cancel', 'decline'):
+			self.__dispatch_error(reason, reason, text)
+		if text:
+			text = '%s (%s)' % (reason, text)
+		else:
+			# TODO
+			text = reason
+		self.connection.dispatch('JINGLE_DISCONNECTED',
+			(self.peerjid, self.sid, None, text))
+
+	def __broadcast_all(self, stanza, jingle, error, action):
+		"""
+		Broadcast the stanza to all content handlers
+		"""
+		for content in self.contents.itervalues():
+			content.on_stanza(stanza, None, error, action)
+
+	def __parse_contents(self, jingle):
+		# TODO: Needs some reworking
+		contents = []
+		contents_rejected = []
+		reasons = set()
+
+		for element in jingle.iterTags('content'):
+			transport = get_jingle_transport(element.getTag('transport'))
+			content_type = get_jingle_content(element.getTag('description'))
+			if content_type:
+				try:
+					if transport:
+						content = content_type(self, transport)
+						self.add_content(element['name'],
+							content, 'peer')
+						contents.append((content.media,))
+					else:
+						reasons.add('unsupported-transports')
+						contents_rejected.append((element['name'], 'peer'))
+				except JingleContentSetupException:
+					reasons.add('failed-application')
+			else:
+				contents_rejected.append((element['name'], 'peer'))
+				failed.add('unsupported-applications')
+
+		failure_reason = None
+
+		# Store the first reason of failure
+		for reason in ('failed-application', 'unsupported-transports',
+			'unsupported-applications'):
+			if reason in reasons:
+				failure_reason = reason
+				break
+
+		return (contents, contents_rejected, failure_reason)
+
+	def __dispatch_error(self, error, jingle_error=None, text=None):
+		if jingle_error:
+			error = jingle_error
+		if text:
+			text = '%s (%s)' % (error, text)
+		else:
+			text = error
+		self.connection.dispatch('JINGLE_ERROR', (self.peerjid, self.sid, text))
+
+	def __reason_from_stanza(self, stanza):
+		reason = 'success'
+		reasons = ['success', 'busy', 'cancel', 'connectivity-error',
+			'decline', 'expired', 'failed-application', 'failed-transport',
+			'general-error', 'gone', 'incompatible-parameters', 'media-error',
+			'security-error', 'timeout', 'unsupported-applications',
+			'unsupported-transports']
+		tag = stanza.getTag('reason')
+		if tag:
+			text = tag.getTagData('text')
+			for r in reasons:
+				if tag.getTag(r):
+					reason = r
+					break
+		return (reason, text)
+
+	def __make_jingle(self, action):
+		stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.peerjid))
+		attrs = {'action': action,
+			'sid': self.sid}
+		if action == 'session-initiate':
+			attrs['initiator'] = self.initiator
+		elif action == 'session-accept':
+			attrs['responder'] = self.responder
+		jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE)
+		return stanza, jingle
+
+	def __send_error(self, stanza, error, jingle_error=None, text=None):
+		err = xmpp.Error(stanza, '%s %s' % (xmpp.NS_STANZAS, error))
+		if jingle_error:
+			err.setTag(jingle_error, namespace=xmpp.NS_JINGLE_ERRORS)
+		if text:
+			err.setTagData('text', text)
+		self.connection.connection.send(err)
+		self.__dispatch_error(error, jingle_error, text)
+
+	def __append_content(self, jingle, content):
+		"""
+		Append <content/> element to <jingle/> element, with (full=True) or
+		without (full=False) <content/> children
+		"""
+		jingle.addChild('content',
+			attrs={'name': content.name, 'creator': content.creator})
+
+	def __append_contents(self, jingle):
+		"""
+		Append all <content/> elements to <jingle/>
+		"""
+		# TODO: integrate with __appendContent?
+		# TODO: parameters 'name', 'content'?
+		for content in self.contents.values():
+			self.__append_content(jingle, content)
+
+	def __session_initiate(self):
+		assert self.state == JingleStates.ended
+		stanza, jingle = self.__make_jingle('session-initiate')
+		self.__append_contents(jingle)
+		self.__broadcast(stanza, jingle, None, 'session-initiate-sent')
+		self.connection.connection.send(stanza)
+		self.state = JingleStates.pending
+
+	def __session_accept(self):
+		assert self.state == JingleStates.pending
+		stanza, jingle = self.__make_jingle('session-accept')
+		self.__append_contents(jingle)
+		self.__broadcast(stanza, jingle, None, 'session-accept-sent')
+		self.connection.connection.send(stanza)
+		self.state = JingleStates.active
+
+	def __session_info(self, payload=None):
+		assert self.state != JingleStates.ended
+		stanza, jingle = self.__make_jingle('session-info')
+		if payload:
+			jingle.addChild(node=payload)
+		self.connection.connection.send(stanza)
+
+	def _session_terminate(self, reason=None):
+		assert self.state != JingleStates.ended
+		stanza, jingle = self.__make_jingle('session-terminate')
+		if reason is not None:
+			jingle.addChild(node=reason)
+		self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent')
+		self.connection.connection.send(stanza)
+		reason, text = self.__reason_from_stanza(jingle)
+		if reason not in ('success', 'cancel', 'decline'):
+			self.__dispatch_error(reason, reason, text)
+		if text:
+			text = '%s (%s)' % (reason, text)
+		else:
+			text = reason
+		self.connection.delete_jingle_session(self.peerjid, self.sid)
+		self.connection.dispatch('JINGLE_DISCONNECTED',
+			(self.peerjid, self.sid, None, text))
+
+	def __content_add(self, content):
+		# TODO: test
+		assert self.state != JingleStates.ended
+		stanza, jingle = self.__make_jingle('content-add')
+		self.__append_content(jingle, content)
+		self.__broadcast(stanza, jingle, None, 'content-add-sent')
+		self.connection.connection.send(stanza)
+
+	def __content_accept(self, content):
+		# TODO: test
+		assert self.state != JingleStates.ended
+		stanza, jingle = self.__make_jingle('content-accept')
+		self.__append_content(jingle, content)
+		self.__broadcast(stanza, jingle, None, 'content-accept-sent')
+		self.connection.connection.send(stanza)
+
+	def __content_reject(self, content):
+		assert self.state != JingleStates.ended
+		stanza, jingle = self.__make_jingle('content-reject')
+		self.__append_content(jingle, content)
+		self.connection.connection.send(stanza)
+		# TODO: this will fail if content is not an RTP content
+		self.connection.dispatch('JINGLE_DISCONNECTED',
+			(self.peerjid, self.sid, content.media, 'rejected'))
+
+	def __content_modify(self):
+		assert self.state != JingleStates.ended
+
+	def __content_remove(self, content):
+		assert self.state != JingleStates.ended
+		stanza, jingle = self.__make_jingle('content-remove')
+		self.__append_content(jingle, content)
+		self.connection.connection.send(stanza)
+		# TODO: this will fail if content is not an RTP content
+		self.connection.dispatch('JINGLE_DISCONNECTED',
+			(self.peerjid, self.sid, content.media, 'removed'))
+
+	def content_negotiated(self, media):
+		self.connection.dispatch('JINGLE_CONNECTED', (self.peerjid, self.sid,
+			media))
+
+# vim: se ts=3:
diff --git a/src/common/jingle_transport.py b/src/common/jingle_transport.py
new file mode 100644
index 000000000..82a0cb987
--- /dev/null
+++ b/src/common/jingle_transport.py
@@ -0,0 +1,150 @@
+##
+## Copyright (C) 2006 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; version 2 only.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+"""
+Handles Jingle Transports (currently only ICE-UDP)
+"""
+
+import xmpp
+
+transports = {}
+
+def get_jingle_transport(node):
+	namespace = node.getNamespace()
+	if namespace in transports:
+		return transports[namespace]()
+
+
+class TransportType(object):
+	"""
+	Possible types of a JingleTransport
+	"""
+	datagram = 1
+	streaming = 2
+
+
+class JingleTransport(object):
+	"""
+	An abstraction of a transport in Jingle sessions
+	"""
+
+	def __init__(self, type_):
+		self.type = type_
+		self.candidates = []
+		self.remote_candidates = []
+
+	def _iter_candidates(self):
+		for candidate in self.candidates:
+			yield self.make_candidate(candidate)
+
+	def make_candidate(self, candidate):
+		"""
+		Build a candidate stanza for the given candidate
+		"""
+		pass
+
+	def make_transport(self, candidates=None):
+		"""
+		Build a transport stanza with the given candidates (or self.candidates if
+		candidates is None)
+		"""
+		if not candidates:
+			candidates = self._iter_candidates()
+		else:
+			candidates = (self.make_candidate(candidate) for candidate in candidates)
+		transport = xmpp.Node('transport', payload=candidates)
+		return transport
+
+	def parse_transport_stanza(self, transport):
+		"""
+		Return the list of transport candidates from a transport stanza
+		"""
+		return []
+
+
+import farsight
+
+class JingleTransportICEUDP(JingleTransport):
+	def __init__(self):
+		JingleTransport.__init__(self, TransportType.datagram)
+
+	def make_candidate(self, candidate):
+		types = {farsight.CANDIDATE_TYPE_HOST: 'host',
+			farsight.CANDIDATE_TYPE_SRFLX: 'srflx',
+			farsight.CANDIDATE_TYPE_PRFLX: 'prflx',
+			farsight.CANDIDATE_TYPE_RELAY: 'relay',
+			farsight.CANDIDATE_TYPE_MULTICAST: 'multicast'}
+		attrs = {
+			'component': candidate.component_id,
+			'foundation': '1', # hack
+			'generation': '0',
+			'ip': candidate.ip,
+			'network': '0',
+			'port': candidate.port,
+			'priority': int(candidate.priority), # hack
+		}
+		if candidate.type in types:
+			attrs['type'] = types[candidate.type]
+		if candidate.proto == farsight.NETWORK_PROTOCOL_UDP:
+			attrs['protocol'] = 'udp'
+		else:
+			# we actually don't handle properly different tcp options in jingle
+			attrs['protocol'] = 'tcp'
+		return xmpp.Node('candidate', attrs=attrs)
+
+	def make_transport(self, candidates=None):
+		transport = JingleTransport.make_transport(self, candidates)
+		transport.setNamespace(xmpp.NS_JINGLE_ICE_UDP)
+		if self.candidates and self.candidates[0].username and \
+			self.candidates[0].password:
+				transport.setAttr('ufrag', self.candidates[0].username)
+				transport.setAttr('pwd', self.candidates[0].password)
+		return transport
+
+	def parse_transport_stanza(self, transport):
+		candidates = []
+		for candidate in transport.iterTags('candidate'):
+			cand = farsight.Candidate()
+			cand.component_id = int(candidate['component'])
+			cand.ip = str(candidate['ip'])
+			cand.port = int(candidate['port'])
+			cand.foundation = str(candidate['foundation'])
+			#cand.type = farsight.CANDIDATE_TYPE_LOCAL
+			cand.priority = int(candidate['priority'])
+
+			if candidate['protocol'] == 'udp':
+				cand.proto = farsight.NETWORK_PROTOCOL_UDP
+			else:
+				# we actually don't handle properly different tcp options in jingle
+				cand.proto = farsight.NETWORK_PROTOCOL_TCP
+
+			cand.username = str(transport['ufrag'])
+			cand.password = str(transport['pwd'])
+
+			#FIXME: huh?
+			types = {'host': farsight.CANDIDATE_TYPE_HOST,
+						'srflx': farsight.CANDIDATE_TYPE_SRFLX,
+						'prflx': farsight.CANDIDATE_TYPE_PRFLX,
+						'relay': farsight.CANDIDATE_TYPE_RELAY,
+						'multicast': farsight.CANDIDATE_TYPE_MULTICAST}
+			if 'type' in candidate and candidate['type'] in types:
+				cand.type = types[candidate['type']]
+			else:
+				print 'Unknown type %s', candidate['type']
+			candidates.append(cand)
+		self.remote_candidates.extend(candidates)
+		return candidates
+
+transports[xmpp.NS_JINGLE_ICE_UDP] = JingleTransportICEUDP
+
+# vim: se ts=3:
diff --git a/src/common/kwalletbinding.py b/src/common/kwalletbinding.py
index 0de030bd8..842aff8b9 100644
--- a/src/common/kwalletbinding.py
+++ b/src/common/kwalletbinding.py
@@ -25,7 +25,9 @@ import subprocess
 
 
 def kwallet_available():
-	"""Return True if kwalletcli can be run, False otherwise."""
+	"""
+	Return True if kwalletcli can be run, False otherwise
+	"""
 	try:
 		p = subprocess.Popen(["kwalletcli", "-qV"])
 	except Exception:
@@ -37,7 +39,8 @@ def kwallet_available():
 
 
 def kwallet_get(folder, entry):
-	"""Retrieve a passphrase from the KDE Wallet via kwalletcli.
+	"""
+	Retrieve a passphrase from the KDE Wallet via kwalletcli
 
 	Arguments:
 	• folder: The top-level category to use (normally the programme name)
@@ -45,7 +48,6 @@ def kwallet_get(folder, entry):
 
 	Returns the passphrase as unicode, False if it cannot be found,
 	or None if an error occured.
-
 	"""
 	p = subprocess.Popen(["kwalletcli", "-q", "-f", folder.encode('utf-8'),
 	 "-e", entry.encode('utf-8')], stdout=subprocess.PIPE)
@@ -60,7 +62,8 @@ def kwallet_get(folder, entry):
 
 
 def kwallet_put(folder, entry, passphrase):
-	"""Store a passphrase into the KDE Wallet via kwalletcli.
+	"""
+	Store a passphrase into the KDE Wallet via kwalletcli
 
 	Arguments:
 	• folder: The top-level category to use (normally the programme name)
@@ -68,7 +71,6 @@ def kwallet_put(folder, entry, passphrase):
 	• passphrase: The value to store
 
 	Returns True on success, False otherwise.
-
 	"""
 	p = subprocess.Popen(["kwalletcli", "-q", "-f", folder.encode('utf-8'),
 	 "-e", entry.encode('utf-8'), "-P"], stdin=subprocess.PIPE)
diff --git a/src/common/latex.py b/src/common/latex.py
index 777577d1c..492f04c39 100644
--- a/src/common/latex.py
+++ b/src/common/latex.py
@@ -86,8 +86,9 @@ def popen_nt_friendly(command):
 		return Popen(command, cwd=gettempdir(), stdout=PIPE)
 
 def check_for_latex_support():
-	'''check is latex is available and if it can create a picture.'''
-
+	"""
+	Check if latex is available and if it can create a picture
+	"""
 	try:
 		filename = latex_to_image("test")
 		if filename:
diff --git a/src/common/location_listener.py b/src/common/location_listener.py
new file mode 100644
index 000000000..f1ba5b714
--- /dev/null
+++ b/src/common/location_listener.py
@@ -0,0 +1,137 @@
+# -*- coding: utf-8 -*-
+## src/common/location_listener.py
+##
+## Copyright (C) 2009 Yann Leboulanger <asterix AT lagaule.org>
+##
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 3 only.
+##
+## Gajim is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+##
+
+from common import gajim
+from common import pep
+from common import dbus_support
+if dbus_support.supported:
+	import dbus
+	import dbus.glib
+
+class LocationListener:
+	_instance = None
+	@classmethod
+	def get(cls):
+		if cls._instance is None:
+			cls._instance = cls()
+		return cls._instance
+
+	def __init__(self):
+		self._data = {}
+
+	def get_data(self):
+		self._get_address()
+		self._get_position()
+
+	def _get_address(self):
+		bus = dbus.SessionBus()
+		if 'org.freedesktop.Geoclue.Master' not in bus.list_names():
+			self._on_geoclue_address_changed()
+			return
+		obj = bus.get_object('org.freedesktop.Geoclue.Master',
+			'/org/freedesktop/Geoclue/Master')
+		# get MasterClient path
+		path = obj.Create()
+		# get MasterClient
+		cli = bus.get_object('org.freedesktop.Geoclue.Master', path)
+		cli.AddressStart()
+		# Check that there is a provider
+		name, description, service, path = cli.GetAddressProvider()
+		if path:
+			timestamp, address, accuracy = cli.GetAddress()
+			self._on_geoclue_address_changed(timestamp, address, accuracy)
+
+	def _get_position(self):
+		bus = dbus.SessionBus()
+		if 'org.freedesktop.Geoclue.Master' not in bus.list_names():
+			self._on_geoclue_position_changed()
+			return
+		obj = bus.get_object('org.freedesktop.Geoclue.Master',
+			'/org/freedesktop/Geoclue/Master')
+		# get MasterClient path
+		path = obj.Create()
+		# get MasterClient
+		cli = bus.get_object('org.freedesktop.Geoclue.Master', path)
+		cli.PositionStart()
+		# Check that there is a provider
+		name, description, service, path = cli.GetPositionProvider()
+		if path:
+			fields, timestamp, lat, lon, alt, accuray = cli.GetPosition()
+			self._on_geoclue_position_changed(fields, timestamp, lat, lon, alt,
+				accuracy)
+
+	def start(self):
+		self.get_data()
+		bus = dbus.SessionBus()
+		# Geoclue
+		bus.add_signal_receiver(self._on_geoclue_address_changed,
+			'AddressChanged', 'org.freedesktop.Geoclue.Address')
+		bus.add_signal_receiver(self._on_geoclue_position_changed,
+			'PositionChanged', 'org.freedesktop.Geoclue.Position')
+
+	def shut_down(self):
+		pass
+
+	def _on_geoclue_address_changed(self, timestamp=None, address={},
+	accuracy=None):
+		# update data with info we just received
+		for field in ['country', 'countrycode', 'locality', 'postalcode',
+		'region', 'street']:
+			self._data[field] = address.get(field, None)
+		if timestamp:
+			self._data['timestamp'] = timestamp
+		if accuracy:
+			# in PEP it's horizontal accuracy
+			self._data['accuracy'] = accuracy[1]
+		self._send_location()
+
+	def _on_geoclue_position_changed(self, fields=[], timestamp=None, lat=None,
+	lon=None, alt=None, accuracy=None):
+		# update data with info we just received
+		_dict = {'lat': lat, 'lon': lon, 'alt': alt}
+		for field in _dict:
+			if _dict[field] is not None:
+				self._data[field] = _dict[field]
+		if timestamp:
+			self._data['timestamp'] = timestamp
+		if accuracy:
+			# in PEP it's horizontal accuracy
+			self._data['accuracy'] = accuracy[1]
+		self._send_location()
+
+	def _send_location(self):
+		accounts = gajim.connections.keys()
+		for acct in accounts:
+			if not gajim.account_is_connected(acct):
+				continue
+			if not gajim.config.get_per('accounts', acct, 'publish_location'):
+				continue
+			if gajim.connections[acct].location_info == self._data:
+				continue
+			gajim.connections[acct].send_location(self._data)
+			gajim.connections[acct].location_info = self._data
+
+def enable():
+	listener = LocationListener.get()
+	listener.start()
+
+def disable():
+	listener = LocationListener.get()
+	listener.shut_down()
diff --git a/src/common/logger.py b/src/common/logger.py
index c96282743..507b29cfa 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -24,7 +24,9 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-''' This module allows to access the on-disk database of logs. '''
+"""
+This module allows to access the on-disk database of logs
+"""
 
 import os
 import sys
@@ -36,13 +38,7 @@ from cStringIO import StringIO
 import exceptions
 import gajim
 
-try:
-	import sqlite3 as sqlite # python 2.5
-except ImportError:
-	try:
-		from pysqlite2 import dbapi2 as sqlite
-	except ImportError:
-		raise exceptions.PysqliteNotAvailable
+import sqlite3 as sqlite
 
 import configpaths
 LOG_DB_PATH = configpaths.gajimpaths['LOG_DB']
@@ -150,7 +146,9 @@ class Logger:
 		self.get_jids_already_in_db()
 
 	def simple_commit(self, sql_to_commit):
-		'''helper to commit'''
+		"""
+		Helper to commit
+		"""
 		self.cur.execute(sql_to_commit)
 		try:
 			self.con.commit()
@@ -177,14 +175,14 @@ class Logger:
 		return self.jids_already_in
 
 	def jid_is_from_pm(self, jid):
-		'''if jid is gajim@conf/nkour it's likely a pm one, how we know
-		gajim@conf is not a normal guy and nkour is not his resource?
-		we ask if gajim@conf is already in jids (with type room jid)
-		this fails if user disables logging for room and only enables for
-		pm (so higly unlikely) and if we fail we do not go chaos
-		(user will see the first pm as if it was message in room's public chat)
-		and after that all okay'''
-
+		"""
+		If jid is gajim@conf/nkour it's likely a pm one, how we know gajim@conf
+		is not a normal guy and nkour is not his resource?  we ask if gajim@conf
+		is already in jids (with type room jid) this fails if user disables
+		logging for room and only enables for pm (so higly unlikely) and if we
+		fail we do not go chaos (user will see the first pm as if it was message
+		in room's public chat) and after that all okay
+		"""
 		if jid.find('/') > -1:
 			possible_room_jid = jid.split('/', 1)[0]
 			return self.jid_is_room_jid(possible_room_jid)
@@ -202,13 +200,14 @@ class Logger:
 			return True
 
 	def get_jid_id(self, jid, typestr=None):
-		'''jids table has jid and jid_id
-		logs table has log_id, jid_id, contact_name, time, kind, show, message
-		so to ask logs we need jid_id that matches our jid in jids table
-		this method wants jid and returns the jid_id for later sql-ing on logs
-		typestr can be 'ROOM' or anything else depending on the type of JID
-		and is only needed to be specified when the JID is new in DB
-		'''
+		"""
+		jids table has jid and jid_id logs table has log_id, jid_id,
+		contact_name, time, kind, show, message so to ask logs we need jid_id
+		that matches our jid in jids table this method wants jid and returns the
+		jid_id for later sql-ing on logs typestr can be 'ROOM' or anything else
+		depending on the type of JID and is only needed to be specified when the
+		JID is new in DB
+		"""
 		if jid.find('/') != -1: # if it has a /
 			jid_is_from_pm = self.jid_is_from_pm(jid)
 			if not jid_is_from_pm: # it's normal jid with resource
@@ -238,7 +237,9 @@ class Logger:
 		return jid_id
 
 	def convert_human_values_to_db_api_values(self, kind, show):
-		'''coverts from string style to constant ints for db'''
+		"""
+		Convert from string style to constant ints for db
+		"""
 		if kind == 'status':
 			kind_col = constants.KIND_STATUS
 		elif kind == 'gcstatus':
@@ -277,7 +278,9 @@ class Logger:
 		return kind_col, show_col
 
 	def convert_human_transport_type_to_db_api_values(self, type_):
-		'''converts from string style to constant ints for db'''
+		"""
+		Convert from string style to constant ints for db
+		"""
 		if type_ == 'aim':
 			return constants.TYPE_AIM
 		if type_ == 'gadu-gadu':
@@ -309,7 +312,9 @@ class Logger:
 		return None
 
 	def convert_api_values_to_human_transport_type(self, type_id):
-		'''converts from constant ints for db to string style'''
+		"""
+		Convert from constant ints for db to string style
+		"""
 		if type_id == constants.TYPE_AIM:
 			return 'aim'
 		if type_id == constants.TYPE_GG:
@@ -340,7 +345,9 @@ class Logger:
 			return 'mrim'
 
 	def convert_human_subscription_values_to_db_api_values(self, sub):
-		'''converts from string style to constant ints for db'''
+		"""
+		Convert from string style to constant ints for db
+		"""
 		if sub == 'none':
 			return constants.SUBSCRIPTION_NONE
 		if sub == 'to':
@@ -351,7 +358,9 @@ class Logger:
 			return constants.SUBSCRIPTION_BOTH
 
 	def convert_db_api_values_to_human_subscription_values(self, sub):
-		'''converts from constant ints for db to string style'''
+		"""
+		Convert from constant ints for db to string style
+		"""
 		if sub == constants.SUBSCRIPTION_NONE:
 			return 'none'
 		if sub == constants.SUBSCRIPTION_TO:
@@ -382,30 +391,40 @@ class Logger:
 		return message_id
 
 	def insert_unread_events(self, message_id, jid_id):
-		''' add unread message with id: message_id'''
+		"""
+		Add unread message with id: message_id
+		"""
 		sql = 'INSERT INTO unread_messages VALUES (%d, %d, 0)' % (message_id,
 			jid_id)
 		self.simple_commit(sql)
 
 	def set_read_messages(self, message_ids):
-		''' mark all messages with ids in message_ids as read'''
+		"""
+		Mark all messages with ids in message_ids as read
+		"""
 		ids = ','.join([str(i) for i in message_ids])
 		sql = 'DELETE FROM unread_messages WHERE message_id IN (%s)' % ids
 		self.simple_commit(sql)
 
 	def set_shown_unread_msgs(self, msg_id):
-		''' mark unread message as shown un GUI '''
+		"""
+		Mark unread message as shown un GUI
+		"""
 		sql = 'UPDATE unread_messages SET shown = 1 where message_id = %s' % \
 			msg_id
 		self.simple_commit(sql)
 
 	def reset_shown_unread_messages(self):
-		''' Set shown field to False in unread_messages table '''
+		"""
+		Set shown field to False in unread_messages table
+		"""
 		sql = 'UPDATE unread_messages SET shown = 0'
 		self.simple_commit(sql)
 
 	def get_unread_msgs(self):
-		''' get all unread messages '''
+		"""
+		Get all unread messages
+		"""
 		all_messages = []
 		try:
 			self.cur.execute(
@@ -435,15 +454,18 @@ class Logger:
 		return all_messages
 
 	def write(self, kind, jid, message=None, show=None, tim=None, subject=None):
-		'''write a row (status, gcstatus, message etc) to logs database
+		"""
+		Write a row (status, gcstatus, message etc) to logs database
+
 		kind can be status, gcstatus, gc_msg, (we only recv for those 3),
-		single_msg_recv, chat_msg_recv, chat_msg_sent, single_msg_sent
-		we cannot know if it is pm or normal chat message, we try to guess
-		see jid_is_from_pm()
+		single_msg_recv, chat_msg_recv, chat_msg_sent, single_msg_sent we cannot
+		know if it is pm or normal chat message, we try to guess see
+		jid_is_from_pm()
 
-		we analyze jid and store it as follows:
-		jids.jid text column will hold JID if TC-related, room_jid if GC-related,
-		ROOM_JID/nick if pm-related.'''
+		We analyze jid and store it as follows:
+			jids.jid text column will hold JID if TC-related, room_jid if GC-related,
+			ROOM_JID/nick if pm-related.
+		"""
 
 		if self.jids_already_in == []: # only happens if we just created the db
 			self.open_db()
@@ -516,12 +538,14 @@ class Logger:
 		return self.commit_to_db(values, write_unread)
 
 	def get_last_conversation_lines(self, jid, restore_how_many_rows,
-	pending_how_many, timeout, account):
-		'''accepts how many rows to restore and when to time them out (in minutes)
-		(mark them as too old) and number of messages that are in queue
-		and are already logged but pending to be viewed,
-		returns a list of tupples containg time, kind, message,
-		list with empty tupple if nothing found to meet our demands'''
+			pending_how_many, timeout, account):
+		"""
+		Accept how many rows to restore and when to time them out (in minutes)
+		(mark them as too old) and number of messages that are in queue and are
+		already logged but pending to be viewed, returns a list of tupples
+		containg time, kind, message, list with empty tupple if nothing found to
+		meet our demands
+		"""
 		try:
 			self.get_jid_id(jid)
 		except exceptions.PysqliteOperationalError, e:
@@ -561,9 +585,12 @@ class Logger:
 		return start_of_day
 
 	def get_conversation_for_date(self, jid, year, month, day, account):
-		'''returns contact_name, time, kind, show, message, subject
-		for each row in a list of tupples,
-		returns list with empty tupple if we found nothing to meet our demands'''
+		"""
+		Return contact_name, time, kind, show, message, subject
+
+		For each row in a list of tupples, returns list with empty tupple if we
+		found nothing to meet our demands
+		"""
 		try:
 			self.get_jid_id(jid)
 		except exceptions.PysqliteOperationalError, e:
@@ -586,9 +613,12 @@ class Logger:
 		return results
 
 	def get_search_results_for_query(self, jid, query, account):
-		'''returns contact_name, time, kind, show, message
-		for each row in a list of tupples,
-		returns list with empty tupple if we found nothing to meet our demands'''
+		"""
+		Returns contact_name, time, kind, show, message
+
+		For each row in a list of tupples, returns list with empty tupple if we
+		found nothing to meet our demands
+		"""
 		try:
 			self.get_jid_id(jid)
 		except exceptions.PysqliteOperationalError, e:
@@ -615,7 +645,9 @@ class Logger:
 		return results
 
 	def get_days_with_logs(self, jid, year, month, max_day, account):
-		'''returns the list of days that have logs (not status messages)'''
+		"""
+		Return the list of days that have logs (not status messages)
+		"""
 		try:
 			self.get_jid_id(jid)
 		except exceptions.PysqliteOperationalError, e:
@@ -650,8 +682,10 @@ class Logger:
 		return days_with_logs
 
 	def get_last_date_that_has_logs(self, jid, account=None, is_room=False):
-		'''returns last time (in seconds since EPOCH) for which
-		we had logs (excluding statuses)'''
+		"""
+		Return last time (in seconds since EPOCH) for which we had logs
+		(excluding statuses)
+		"""
 		where_sql = ''
 		if not is_room:
 			where_sql = self._build_contact_where(account, jid)
@@ -676,8 +710,10 @@ class Logger:
 		return result
 
 	def get_room_last_message_time(self, jid):
-		'''returns FASTLY last time (in seconds since EPOCH) for which
-		we had logs for that room from rooms_last_message_time table'''
+		"""
+		Return FASTLY last time (in seconds since EPOCH) for which we had logs
+		for that room from rooms_last_message_time table
+		"""
 		try:
 			jid_id = self.get_jid_id(jid, 'ROOM')
 		except exceptions.PysqliteOperationalError, e:
@@ -697,8 +733,10 @@ class Logger:
 		return result
 
 	def set_room_last_message_time(self, jid, time):
-		'''set last time (in seconds since EPOCH) for which
-		we had logs for that room in rooms_last_message_time table'''
+		"""
+		Set last time (in seconds since EPOCH) for which we had logs for that
+		room in rooms_last_message_time table
+		"""
 		jid_id = self.get_jid_id(jid, 'ROOM')
 		# jid_id is unique in this table, create or update :
 		sql = 'REPLACE INTO rooms_last_message_time VALUES (%d, %d)' % \
@@ -706,8 +744,9 @@ class Logger:
 		self.simple_commit(sql)
 
 	def _build_contact_where(self, account, jid):
-		'''build the where clause for a jid, including metacontacts
-		jid(s) if any'''
+		"""
+		Build the where clause for a jid, including metacontacts jid(s) if any
+		"""
 		where_sql = ''
 		# will return empty list if jid is not associated with
 		# any metacontacts
@@ -727,7 +766,9 @@ class Logger:
 		return where_sql
 
 	def save_transport_type(self, jid, type_):
-		'''save the type of the transport in DB'''
+		"""
+		Save the type of the transport in DB
+		"""
 		type_id = self.convert_human_transport_type_to_db_api_values(type_)
 		if not type_id:
 			# unknown type
@@ -747,7 +788,9 @@ class Logger:
 		self.simple_commit(sql)
 
 	def get_transports_type(self):
-		'''return all the type of the transports in DB'''
+		"""
+		Return all the type of the transports in DB
+		"""
 		self.cur.execute(
 			'SELECT * from transports_cache')
 		results = self.cur.fetchall()
@@ -767,11 +810,13 @@ class Logger:
 	# (2)
 	# GzipFile needs a file-like object, StringIO emulates file for plain strings
 	def iter_caps_data(self):
-		''' Iterate over caps cache data stored in the database.
+		"""
+		Iterate over caps cache data stored in the database
+
 		The iterator values are pairs of (node, ver, ext, identities, features):
 		identities == {'category':'foo', 'type':'bar', 'name':'boo'},
-		features being a list of feature namespaces. '''
-
+		features being a list of feature namespaces.
+		"""
 		# get data from table
 		# the data field contains binary object (gzipped data), this is a hack
 		# to get that data without trying to convert it to unicode
@@ -854,16 +899,21 @@ class Logger:
 		self.simple_commit(sql)
 
 	def clean_caps_table(self):
-		'''Remove caps which was not seen for 3 months'''
+		"""
+		Remove caps which was not seen for 3 months
+		"""
 		sql = '''DELETE FROM caps_cache WHERE last_seen < %d''' % \
 			int(time.time() - 3*30*24*3600)
 		self.simple_commit(sql)
 
 	def replace_roster(self, account_name, roster_version, roster):
-		''' Replace current roster in DB by a new one.
-		accout_name is the name of the account to change
-		roster_version is the version of the new roster
-		roster is the new version '''
+		"""
+		Replace current roster in DB by a new one
+
+		accout_name is the name of the account to change.
+		roster_version is the version of the new roster.
+		roster is the new version.
+		"""
 		# First we must reset roster_version value to ensure that the server
 		# sends back all the roster at the next connexion if the replacement
 		# didn't work properly.
@@ -887,7 +937,9 @@ class Logger:
 			roster_version)
 
 	def del_contact(self, account_jid, jid):
-		''' Remove jid from account_jid roster. '''
+		"""
+		Remove jid from account_jid roster
+		"""
 		try:
 			account_jid_id = self.get_jid_id(account_jid)
 			jid_id = self.get_jid_id(jid)
@@ -902,7 +954,9 @@ class Logger:
 		self.con.commit()
 
 	def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups):
-		''' Add or update a contact from account_jid roster. '''
+		"""
+		Add or update a contact from account_jid roster
+		"""
 		if sub == 'remove':
 			self.del_contact(account_jid, jid)
 			return
@@ -933,7 +987,9 @@ class Logger:
 		self.con.commit()
 
 	def get_roster(self, account_jid):
-		''' Return the accound_jid roster in NonBlockingRoster format. '''
+		"""
+		Return the accound_jid roster in NonBlockingRoster format
+		"""
 		data = {}
 		account_jid_id = self.get_jid_id(account_jid)
 
@@ -972,7 +1028,9 @@ class Logger:
 		return data
 
 	def remove_roster(self, account_jid):
-		''' Remove all entry from account_jid roster. '''
+		"""
+		Remove all entry from account_jid roster
+		"""
 		account_jid_id = self.get_jid_id(account_jid)
 
 		self.cur.execute('DELETE FROM roster_entry WHERE account_jid_id=?',
diff --git a/src/common/logging_helpers.py b/src/common/logging_helpers.py
index ae5d1da3e..733958b2e 100644
--- a/src/common/logging_helpers.py
+++ b/src/common/logging_helpers.py
@@ -23,7 +23,7 @@ import i18n
 
 def parseLogLevel(arg):
 	"""
-	eiter numeric value or level name from logging module
+	Eiter numeric value or level name from logging module
 	"""
 	if arg.isdigit():
 		return int(arg)
@@ -98,7 +98,7 @@ def colorize(text, color):
 
 class FancyFormatter(logging.Formatter):
 	"""
-	A Eye-candy formatter with colors
+	An eye-candy formatter with colors
 	"""
 	colors_mapping = {
 		'DEBUG':		colors.BLUE,
@@ -134,7 +134,7 @@ class FancyFormatter(logging.Formatter):
 
 def init(use_color=False):
 	"""
-	initialize the logging system
+	Iinitialize the logging system
 	"""
 	consoleloghandler = logging.StreamHandler()
 	consoleloghandler.setFormatter(
diff --git a/src/common/multimedia_helpers.py b/src/common/multimedia_helpers.py
new file mode 100644
index 000000000..4a2a4fb2e
--- /dev/null
+++ b/src/common/multimedia_helpers.py
@@ -0,0 +1,101 @@
+##
+## Copyright (C) 2009 Thibaut GIRKA <thib AT sitedethib.com>
+##
+## 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; version 2 only.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+import gst
+
+
+class DeviceManager(object):
+	def __init__(self):
+		self.devices = {}
+
+	def detect(self):
+		self.devices = {}
+
+	def get_devices(self):
+		if not self.devices:
+			self.detect()
+		return self.devices
+
+	def detect_element(self, name, text, pipe='%s'):
+		try:
+			element = gst.element_factory_make(name, '%spresencetest' % name)
+			if isinstance(element, gst.interfaces.PropertyProbe):
+				element.set_state(gst.STATE_READY)
+				devices = element.probe_get_values_name('device')
+				if devices:
+					self.devices[text % _(' Default device')] = pipe % name
+					for device in devices:
+						element.set_property('device', device)
+						device_name = element.get_property('device-name')
+						self.devices[text % device_name] = pipe % '%s device=%s' % (name, device)
+				element.set_state(gst.STATE_NULL)
+			else:
+				self.devices[text] = pipe % name
+		except gst.ElementNotFoundError:
+			print 'element \'%s\' not found' % name
+
+
+class AudioInputManager(DeviceManager):
+	def detect(self):
+		self.devices = {}
+		# Test src
+		self.detect_element('audiotestsrc', _('Audio test'),
+			'%s is-live=true name=gajim_vol')
+		# Auto src
+		self.detect_element('autoaudiosrc', _('Autodetect'),
+			'%s ! volume name=gajim_vol')
+		# Alsa src
+		self.detect_element('alsasrc', _('ALSA: %s'),
+			'%s ! volume name=gajim_vol')
+
+
+class AudioOutputManager(DeviceManager):
+	def detect(self):
+		self.devices = {}
+		# Fake sink
+		self.detect_element('fakesink', _('Fake audio output'))
+		# Auto sink
+		self.detect_element('autoaudiosink', _('Autodetect'))
+		# Alsa sink
+		self.detect_element('alsasink', _('ALSA: %s'),
+			'%s sync=false')
+
+
+class VideoInputManager(DeviceManager):
+	def detect(self):
+		self.devices = {}
+		# Test src
+		self.detect_element('videotestsrc', _('Video test'),
+			'%s is-live=true')
+		# Auto src
+		self.detect_element('autovideosrc', _('Autodetect'))
+		# V4L2 src ; TODO: Figure out why it doesn't work
+		self.detect_element('v4l2src', _('V4L2: %s'))
+		# Funny things, just to test...
+		# self.devices['GOOM'] = 'audiotestsrc ! goom'
+		# self.devices['screen'] = 'ximagesrc'
+
+
+class VideoOutputManager(DeviceManager):
+	def detect(self):
+		self.devices = {}
+		# Fake video output
+		self.detect_element('fakesink', _('Fake audio output'))
+		# Auto sink
+		self.detect_element('autovideosink', _('Autodetect'))
+		# xvimage sink
+		self.detect_element('xvimagesink', _('X Window System (X11/XShm/Xv): %s'))
+		# ximagesink
+		self.detect_element('ximagesink', _('X Window System (without Xv)'))
+
+
diff --git a/src/common/optparser.py b/src/common/optparser.py
index f9f738d5e..7b7fe911d 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -32,16 +32,9 @@ import re
 from time import time
 from common import gajim
 from common import helpers
-from common import caps
-
-import exceptions
-try:
-	import sqlite3 as sqlite # python 2.5
-except ImportError:
-	try:
-		from pysqlite2 import dbapi2 as sqlite
-	except ImportError:
-		raise exceptions.PysqliteNotAvailable
+from common import caps_cache
+
+import sqlite3 as sqlite
 import logger
 
 class OptionsParser:
@@ -219,16 +212,20 @@ class OptionsParser:
 			self.update_config_to_01257()
 		if old < [0, 12, 5, 8] and new >= [0, 12, 5, 8]:
 			self.update_config_to_01258()
-		if old < [0, 13, 0, 1] and new >= [0, 13, 0, 1]:
-			self.update_config_to_01301()
+		if old < [0, 13, 10, 0] and new >= [0, 13, 10, 0]:
+			self.update_config_to_013100()
+		if old < [0, 13, 10, 1] and new >= [0, 13, 10, 1]:
+			self.update_config_to_013101()
 
 		gajim.logger.init_vars()
 		gajim.config.set('version', new_version)
 
-		caps.capscache.initialize_from_db()
+		caps_cache.capscache.initialize_from_db()
 
 	def assert_unread_msgs_table_exists(self):
-		'''create table unread_messages if there is no such table'''
+		"""
+		Create table unread_messages if there is no such table
+		"""
 		back = os.getcwd()
 		os.chdir(logger.LOG_DB_FOLDER)
 		con = sqlite.connect(logger.LOG_DB_FILE)
@@ -346,8 +343,10 @@ class OptionsParser:
 		gajim.config.set('version', '0.10.1.2')
 
 	def update_config_to_01013(self):
-		'''create table transports_cache if there is no such table'''
-		#FIXME see #2812
+		"""
+		Create table transports_cache if there is no such table
+		"""
+		# FIXME see #2812
 		back = os.getcwd()
 		os.chdir(logger.LOG_DB_FOLDER)
 		con = sqlite.connect(logger.LOG_DB_FILE)
@@ -369,9 +368,11 @@ class OptionsParser:
 		gajim.config.set('version', '0.10.1.3')
 
 	def update_config_to_01014(self):
-		'''apply indeces to the logs database'''
+		"""
+		Apply indeces to the logs database
+		"""
 		print _('migrating logs database to indices')
-		#FIXME see #2812
+		# FIXME see #2812
 		back = os.getcwd()
 		os.chdir(logger.LOG_DB_FOLDER)
 		con = sqlite.connect(logger.LOG_DB_FILE)
@@ -393,7 +394,9 @@ class OptionsParser:
 		gajim.config.set('version', '0.10.1.4')
 
 	def update_config_to_01015(self):
-		'''clean show values in logs database'''
+		"""
+		Clean show values in logs database
+		"""
 		#FIXME see #2812
 		back = os.getcwd()
 		os.chdir(logger.LOG_DB_FOLDER)
@@ -412,8 +415,10 @@ class OptionsParser:
 		gajim.config.set('version', '0.10.1.5')
 
 	def update_config_to_01016(self):
-		'''#2494 : Now we play gc_received_message sound even if
-		notify_on_all_muc_messages is false. Keep precedent behaviour.'''
+		"""
+		#2494 : Now we play gc_received_message sound even if
+		notify_on_all_muc_messages is false. Keep precedent behaviour
+		"""
 		if 'notify_on_all_muc_messages' in self.old_values and \
 		self.old_values['notify_on_all_muc_messages'] == 'False' and \
 		gajim.config.get_per('soundevents', 'muc_message_received', 'enabled'):
@@ -422,36 +427,45 @@ class OptionsParser:
 		gajim.config.set('version', '0.10.1.6')
 
 	def update_config_to_01017(self):
-		'''trayicon_notification_on_new_messages ->
-		trayicon_notification_on_events '''
+		"""
+		trayicon_notification_on_new_messages -> trayicon_notification_on_events
+		"""
 		if 'trayicon_notification_on_new_messages' in self.old_values:
 			gajim.config.set('trayicon_notification_on_events',
 				self.old_values['trayicon_notification_on_new_messages'])
 		gajim.config.set('version', '0.10.1.7')
 
 	def update_config_to_01018(self):
-		'''chat_state_notifications -> outgoing_chat_state_notifications'''
+		"""
+		chat_state_notifications -> outgoing_chat_state_notifications
+		"""
 		if 'chat_state_notifications' in self.old_values:
 			gajim.config.set('outgoing_chat_state_notifications',
 				self.old_values['chat_state_notifications'])
 		gajim.config.set('version', '0.10.1.8')
 
 	def update_config_to_01101(self):
-		'''fill time_stamp from before_time and after_time'''
+		"""
+		Fill time_stamp from before_time and after_time
+		"""
 		if 'before_time' in self.old_values:
 			gajim.config.set('time_stamp', '%s%%X%s ' % (
 				self.old_values['before_time'], self.old_values['after_time']))
 		gajim.config.set('version', '0.11.0.1')
 
 	def update_config_to_01102(self):
-		'''fill time_stamp from before_time and after_time'''
+		"""
+		Fill time_stamp from before_time and after_time
+		"""
 		if 'ft_override_host_to_send' in self.old_values:
 			gajim.config.set('ft_add_hosts_to_send',
 				self.old_values['ft_override_host_to_send'])
 		gajim.config.set('version', '0.11.0.2')
 
 	def update_config_to_01111(self):
-		'''always_hide_chatbuttons -> compact_view'''
+		"""
+		Always_hide_chatbuttons -> compact_view
+		"""
 		if 'always_hide_groupchat_buttons' in self.old_values and \
 		'always_hide_chat_buttons' in self.old_values:
 			gajim.config.set('compact_view', self.old_values['always_hide_groupchat_buttons'] and \
@@ -459,7 +473,9 @@ class OptionsParser:
 		gajim.config.set('version', '0.11.1.1')
 
 	def update_config_to_01112(self):
-		'''gtk+ theme is renamed to default'''
+		"""
+		GTK+ theme is renamed to default
+		"""
 		if 'roster_theme' in self.old_values and \
 		self.old_values['roster_theme'] == 'gtk+':
 			gajim.config.set('roster_theme', _('default'))
@@ -568,7 +584,9 @@ class OptionsParser:
 		gajim.config.set('version', '0.11.4.1')
 
 	def update_config_to_01142(self):
-		'''next_message_received sound event is splittedin 2 events'''
+		"""
+		next_message_received sound event is splittedin 2 events
+		"""
 		gajim.config.add_per('soundevents', 'next_message_received_focused')
 		gajim.config.add_per('soundevents', 'next_message_received_unfocused')
 		if gajim.config.get_per('soundevents', 'next_message_received'):
@@ -681,7 +699,9 @@ class OptionsParser:
 		gajim.config.set('version', '0.12.1.4')
 
 	def update_config_to_01215(self):
-		'''Remove hardcoded ../data/sounds from config'''
+		"""
+		Remove hardcoded ../data/sounds from config
+		"""
 		dirs = ('../data', gajim.gajimpaths.root, gajim.DATA_DIR)
 		for evt in gajim.config.get_per('soundevents'):
 			path = gajim.config.get_per('soundevents', evt ,'path')
@@ -820,7 +840,7 @@ class OptionsParser:
 			'proxy.jabber.ru', 'proxy.jabbim.cz'])
 		gajim.config.set('version', '0.12.5.8')
 
-	def update_config_to_01301(self):
+	def update_config_to_013100(self):
 		back = os.getcwd()
 		os.chdir(logger.LOG_DB_FOLDER)
 		con = sqlite.connect(logger.LOG_DB_FILE)
@@ -837,6 +857,27 @@ class OptionsParser:
 		except sqlite.OperationalError:
 			pass
 		con.close()
-		gajim.config.set('version', '0.13.0.1')
+		gajim.config.set('version', '0.13.10.0')
+
+	def update_config_to_013101(self):
+		back = os.getcwd()
+		os.chdir(logger.LOG_DB_FOLDER)
+		con = sqlite.connect(logger.LOG_DB_FILE)
+		os.chdir(back)
+		cur = con.cursor()
+		try:
+			cur.executescript(
+				'''
+				DROP INDEX IF EXISTS idx_logs_jid_id_kind;
+
+				CREATE INDEX IF NOT EXISTS
+				idx_logs_jid_id_time ON logs (jid_id, time DESC);
+				'''
+			)
+			con.commit()
+		except sqlite.OperationalError:
+			pass
+		con.close()
+		gajim.config.set('version', '0.13.10.1')
 
 # vim: se ts=3:
diff --git a/src/common/passwords.py b/src/common/passwords.py
index 98a7f61d9..9000085c4 100644
--- a/src/common/passwords.py
+++ b/src/common/passwords.py
@@ -122,6 +122,8 @@ class GnomePasswordStorage(PasswordStorage):
 		user = gajim.config.get_per('accounts', account_name, 'name')
 		display_name = _('XMPP account %s@%s') % (user, server)
 		attributes1 = dict(server=str(server), user=str(user), protocol='xmpp')
+		if password is None:
+			password = str()
 		try:
 			auth_token = gnomekeyring.item_create_sync(
 				self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD,
diff --git a/src/common/pep.py b/src/common/pep.py
index 54012514f..e85e7021e 100644
--- a/src/common/pep.py
+++ b/src/common/pep.py
@@ -23,9 +23,6 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import common.gajim
-from common import xmpp
-
 MOODS = {
 	'afraid':			_('Afraid'),
 	'amazed':			_('Amazed'),
@@ -192,390 +189,444 @@ ACTIVITIES = {
 		'studying':								_('Studying'),
 		'writing':								_('Writing')}}
 
-def user_mood(items, name, jid):
-	has_child = False
-	retract = False
-	mood = None
-	text = None
-	for item in items.getTags('item'):
-		child = item.getTag('mood')
-		if child is not None:
-			has_child = True
-			for ch in child.getChildren():
-				if ch.getName() != 'text':
-					mood = ch.getName()
-				else:
-					text = ch.getData()
-	if items.getTag('retract') is not None:
-		retract = True
-
-	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']
-			if 'text' in acc.mood:
-				del acc.mood['text']
-			if mood is not None:
-				acc.mood['mood'] = mood
-			if text is not None:
-				acc.mood['text'] = text
-		elif retract:
-			if 'mood' in acc.mood:
-				del acc.mood['mood']
-			if 'text' in acc.mood:
-				del acc.mood['text']
-
-	(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']
-			if 'text' in contact.mood:
-				del contact.mood['text']
-			if mood is not None:
-				contact.mood['mood'] = mood
-			if text is not None:
-				contact.mood['text'] = text
-		elif retract:
-			if 'mood' in contact.mood:
-				del contact.mood['mood']
-			if 'text' in contact.mood:
-				del contact.mood['text']
-
-	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()
-
-def user_tune(items, name, jid):
-	has_child = False
-	retract = False
-	artist = None
-	title = None
-	source = None
-	track = None
-	length = None
-
-	for item in items.getTags('item'):
-		child = item.getTag('tune')
-		if child is not None:
-			has_child = True
-			for ch in child.getChildren():
-				if ch.getName() == 'artist':
-					artist = ch.getData()
-				elif ch.getName() == 'title':
-					title = ch.getData()
-				elif ch.getName() == 'source':
-					source = ch.getData()
-				elif ch.getName() == 'track':
-					track = ch.getData()
-				elif ch.getName() == 'length':
-					length = ch.getData()
-	if items.getTag('retract') is not None:
-		retract = True
-
-	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']
-			if 'title' in acc.tune:
-				del acc.tune['title']
-			if 'source' in acc.tune:
-				del acc.tune['source']
-			if 'track' in acc.tune:
-				del acc.tune['track']
-			if 'length' in acc.tune:
-				del acc.tune['length']
-			if artist is not None:
-				acc.tune['artist'] = artist
-			if title is not None:
-				acc.tune['title'] = title
-			if source is not None:
-				acc.tune['source'] = source
-			if track is not None:
-				acc.tune['track'] = track
-			if length is not None:
-				acc.tune['length'] = length
-		elif retract:
-			if 'artist' in acc.tune:
-				del acc.tune['artist']
-			if 'title' in acc.tune:
-				del acc.tune['title']
-			if 'source' in acc.tune:
-				del acc.tune['source']
-			if 'track' in acc.tune:
-				del acc.tune['track']
-			if 'length' in acc.tune:
-				del acc.tune['length']
-
-	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']
-			if 'title' in contact.tune:
-				del contact.tune['title']
-			if 'source' in contact.tune:
-				del contact.tune['source']
-			if 'track' in contact.tune:
-				del contact.tune['track']
-			if 'length' in contact.tune:
-				del contact.tune['length']
-			if artist is not None:
-				contact.tune['artist'] = artist
-			if title is not None:
-				contact.tune['title'] = title
-			if source is not None:
-				contact.tune['source'] = source
-			if track is not None:
-				contact.tune['track'] = track
-			if length is not None:
-				contact.tune['length'] = length
-		elif retract:
-			if 'artist' in contact.tune:
-				del contact.tune['artist']
-			if 'title' in contact.tune:
-				del contact.tune['title']
-			if 'source' in contact.tune:
-				del contact.tune['source']
-			if 'track' in contact.tune:
-				del contact.tune['track']
-			if 'length' in contact.tune:
-				del contact.tune['length']
-
-	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()
-
-def user_geoloc(items, name, jid):
-	pass
-
-def user_activity(items, name, jid):
-	has_child = False
-	retract = False
-	activity = None
-	subactivity = None
-	text = None
-
-	for item in items.getTags('item'):
-		child = item.getTag('activity')
-		if child is not None:
-			has_child = True
-			for ch in child.getChildren():
-				if ch.getName() != 'text':
-					activity = ch.getName()
-					for chi in ch.getChildren():
-						subactivity = chi.getName()
-				else:
-					text = ch.getData()
-	if items.getTag('retract') is not None:
-		retract = True
-
-	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']
-			if 'subactivity' in acc.activity:
-				del acc.activity['subactivity']
-			if 'text' in acc.activity:
-				del acc.activity['text']
-			if activity is not None:
-				acc.activity['activity'] = activity
-			if subactivity is not None and subactivity != 'other':
-				acc.activity['subactivity'] = subactivity
-			if text is not None:
-				acc.activity['text'] = text
-		elif retract:
-			if 'activity' in acc.activity:
-				del acc.activity['activity']
-			if 'subactivity' in acc.activity:
-				del acc.activity['subactivity']
-			if 'text' in acc.activity:
-				del acc.activity['text']
-
-	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']
-			if 'subactivity' in contact.activity:
-				del contact.activity['subactivity']
-			if 'text' in contact.activity:
-				del contact.activity['text']
-			if activity is not None:
-				contact.activity['activity'] = activity
-			if subactivity is not None and subactivity != 'other':
-				contact.activity['subactivity'] = subactivity
-			if text is not None:
-				contact.activity['text'] = text
-		elif retract:
-			if 'activity' in contact.activity:
-				del contact.activity['activity']
-			if 'subactivity' in contact.activity:
-				del contact.activity['subactivity']
-			if 'text' in contact.activity:
-				del contact.activity['text']
-
-	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()
-
-def user_nickname(items, name, jid):
-	has_child = False
-	retract = False
-	nick = None
-
-	for item in items.getTags('item'):
-		child = item.getTag('nick')
-		if child is not None:
-			has_child = True
-			nick = child.getData()
-			break
-
-	if items.getTag('retract') is not None:
-		retract = True
-
-	if jid == common.gajim.get_jid_from_account(name):
-		if has_child:
-			common.gajim.nicks[name] = nick
-		if retract:
-			common.gajim.nicks[name] = common.gajim.config.get_per('accounts',
-				name, 'name')
-
-	user = common.gajim.get_room_and_nick_from_fjid(jid)[0]
-	if has_child:
-		if nick is not None:
-			for contact in common.gajim.contacts.get_contacts(name, user):
-				contact.contact_name = nick
-			common.gajim.interface.roster.draw_contact(user, name)
-
-			ctrl = common.gajim.interface.msg_win_mgr.get_control(user, name)
-			if ctrl:
-				ctrl.update_ui()
-				win = ctrl.parent_win
-				win.redraw_tab(ctrl)
-				win.show_title()
-	elif retract:
-		contact.contact_name = ''
-
-def user_send_mood(account, mood, message=''):
-	if not common.gajim.connections[account].pep_supported:
-		return
-	item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD})
-	if mood != '':
-		item.addChild(mood)
-	if message != '':
-		i = item.addChild('text')
-		i.addData(message)
-
-	common.gajim.connections[account].send_pb_publish('', xmpp.NS_MOOD, item,
-		'0')
-
-def user_send_activity(account, activity, subactivity='', message=''):
-	if not common.gajim.connections[account].pep_supported:
-		return
-	item = xmpp.Node('activity', {'xmlns': xmpp.NS_ACTIVITY})
-	if activity != '':
-		i = item.addChild(activity)
-	if subactivity != '':
-		i.addChild(subactivity)
-	if message != '':
-		i = item.addChild('text')
-		i.addData(message)
-
-	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 (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 != '':
-		i = item.addChild('artist')
-		i.addData(artist)
-	if title != '':
-		i = item.addChild('title')
-		i.addData(title)
-	if source != '':
-		i = item.addChild('source')
-		i.addData(source)
-	if track != 0:
-		i = item.addChild('track')
-		i.addData(track)
-	if length != 0:
-		i = item.addChild('length')
-		i.addData(length)
-	if items is not None:
-		item.addChild(payload=items)
-
-	common.gajim.connections[account].send_pb_publish('', xmpp.NS_TUNE, item,
-		'0')
-
-def user_send_nickname(account, nick):
-	if not common.gajim.connections[account].pep_supported:
-		return
-	item = xmpp.Node('nick', {'xmlns': xmpp.NS_NICK})
-	item.addData(nick)
-
-	common.gajim.connections[account].send_pb_publish('', xmpp.NS_NICK, item,
-		'0')
-
-def user_retract_mood(account):
-	common.gajim.connections[account].send_pb_retract('', xmpp.NS_MOOD, '0')
-
-def user_retract_activity(account):
-	common.gajim.connections[account].send_pb_retract('', xmpp.NS_ACTIVITY, '0')
-
-def user_retract_tune(account):
-	common.gajim.connections[account].send_pb_retract('', xmpp.NS_TUNE, '0')
-
-def user_retract_nickname(account):
-	common.gajim.connections[account].send_pb_retract('', xmpp.NS_NICK, '0')
-
-def delete_pep(jid, name):
-	user = common.gajim.get_room_and_nick_from_fjid(jid)[0]
-
-	if jid == common.gajim.get_jid_from_account(name):
-		acc = common.gajim.connections[name]
-		del acc.activity
-		acc.activity = {}
-		user_send_tune(name)
-		del acc.tune
-		acc.tune = {}
-		del acc.mood
-		acc.mood = {}
-
-	for contact in common.gajim.contacts.get_contacts(name, user):
-		del contact.activity
-		contact.activity = {}
-		del contact.tune
-		contact.tune = {}
-		del contact.mood
-		contact.mood = {}
-
-	if jid == common.gajim.get_jid_from_account(name):
-		common.gajim.interface.roster.draw_account(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()
-		ctrl.update_mood()
+TUNE_DATA = ['artist', 'title', 'source', 'track', 'length']
+
+LOCATION_DATA = ['accuracy', 'alt', 'area', 'bearing', 'building', 'country',
+		'countrycode', 'datum', 'description', 'error', 'floor', 'lat',
+		'locality', 'lon', 'postalcode', 'region', 'room', 'speed', 'street',
+		'text', 'timestamp', 'uri']
+
+import gobject
+import gtk
+
+import logging
+log = logging.getLogger('gajim.c.pep')
+
+from common import helpers
+from common import atom
+from common import xmpp
+from common import gajim
+
+import gtkgui_helpers
+
+
+class AbstractPEP(object):
+
+	type = ''
+	namespace = ''
+
+	@classmethod
+	def get_tag_as_PEP(cls, jid, account, event_tag):
+		items = event_tag.getTag('items', {'node': cls.namespace})
+		if items:
+			log.debug("Received PEP 'user %s' from %s" % (cls.type, jid))
+			return cls(jid, account, items)
+		else:
+			return None
+
+	def __init__(self, jid, account, items):
+		self._pep_specific_data, self._retracted = self._extract_info(items)
+
+		self._update_contacts(jid, account)
+		if jid == gajim.get_jid_from_account(account):
+			self._update_account(account)
+
+	def _extract_info(self, items):
+		'''To be implemented by subclasses'''
+		raise NotImplementedError
+
+	def _update_contacts(self, jid, account):
+		for contact in gajim.contacts.get_contacts(account, jid):
+			if self._retracted:
+				if self.type in contact.pep:
+					del contact.pep[self.type]
+			else:
+				contact.pep[self.type] = self
+
+	def _update_account(self, account):
+		acc = gajim.connections[account]
+		if self._retracted:
+			if self.type in acc.pep:
+				del acc.pep[self.type]
+		else:
+			acc.pep[self.type] = self
+
+	def asPixbufIcon(self):
+		'''SHOULD be implemented by subclasses'''
+		return None
+
+	def asMarkupText(self):
+		'''SHOULD be implemented by subclasses'''
+		return ''
+
+
+class UserMoodPEP(AbstractPEP):
+	'''XEP-0107: User Mood'''
+
+	type = 'mood'
+	namespace = xmpp.NS_MOOD
+
+	def _extract_info(self, items):
+		mood_dict = {}
+
+		for item in items.getTags('item'):
+			mood_tag = item.getTag('mood')
+			if mood_tag:
+				for child in mood_tag.getChildren():
+					name = child.getName().strip()
+					if name == 'text':
+						mood_dict['text'] = child.getData()
+					else:
+						mood_dict['mood'] = name
+
+		retracted = items.getTag('retract') or not 'mood' in mood_dict
+		return (mood_dict, retracted)
+
+	def asPixbufIcon(self):
+		assert not self._retracted
+		received_mood = self._pep_specific_data['mood']
+		mood = received_mood if received_mood in MOODS else 'unknown'
+		pixbuf = gtkgui_helpers.load_mood_icon(mood).get_pixbuf()
+		return pixbuf
+
+	def asMarkupText(self):
+		assert not self._retracted
+		untranslated_mood = self._pep_specific_data['mood']
+		mood = self._translate_mood(untranslated_mood)
+		markuptext = '<b>%s</b>' % gobject.markup_escape_text(mood)
+		if 'text' in self._pep_specific_data:
+			text = self._pep_specific_data['text']
+			markuptext += ' (%s)' % gobject.markup_escape_text(text)
+		return markuptext
+
+	def _translate_mood(self, mood):
+		if mood in MOODS:
+			return MOODS[mood]
+		else:
+			return mood
+
+
+class UserTunePEP(AbstractPEP):
+	'''XEP-0118: User Tune'''
+
+	type = 'tune'
+	namespace = xmpp.NS_TUNE
+
+	def _extract_info(self, items):
+		tune_dict = {}
+
+		for item in items.getTags('item'):
+			tune_tag = item.getTag('tune')
+			if tune_tag:
+				for child in tune_tag.getChildren():
+					name = child.getName().strip()
+					data = child.getData().strip()
+					if child.getName() in TUNE_DATA:
+						tune_dict[name] = data
+
+		retracted = items.getTag('retract') or not ('artist' in tune_dict or
+																  'title' in tune_dict)
+		return (tune_dict, retracted)
+
+	def asPixbufIcon(self):
+		import os
+		path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
+		return gtk.gdk.pixbuf_new_from_file(path)
+
+	def asMarkupText(self):
+		assert not self._retracted
+		tune = self._pep_specific_data
+
+		artist = tune.get('artist', _('Unknown Artist'))
+		artist = gobject.markup_escape_text(artist)
+
+		title = tune.get('title', _('Unknown Title'))
+		title = gobject.markup_escape_text(title)
+
+		source = tune.get('source', _('Unknown Source'))
+		source = gobject.markup_escape_text(source)
+
+		tune_string =  _('<b>"%(title)s"</b> by <i>%(artist)s</i>\n'
+			'from <i>%(source)s</i>') % {'title': title,
+			'artist': artist, 'source': source}
+		return tune_string
+
+
+class UserActivityPEP(AbstractPEP):
+	'''XEP-0108: User Activity'''
+
+	type = 'activity'
+	namespace = xmpp.NS_ACTIVITY
+
+	def _extract_info(self, items):
+		activity_dict = {}
+
+		for item in items.getTags('item'):
+			activity_tag = item.getTag('activity')
+			if activity_tag:
+				for child in activity_tag.getChildren():
+					name = child.getName().strip()
+					data = child.getData().strip()
+					if name == 'text':
+						activity_dict['text'] = data
+					else:
+						activity_dict['activity'] = name
+						for subactivity in child.getChildren():
+							subactivity_name = subactivity.getName().strip()
+							activity_dict['subactivity'] = subactivity_name
+
+		retracted = items.getTag('retract') or not 'activity' in activity_dict
+		return (activity_dict, retracted)
+
+	def asPixbufIcon(self):
+		assert not self._retracted
+		pep = self._pep_specific_data
+		activity = pep['activity']
+
+		has_known_activity = activity in ACTIVITIES
+		has_known_subactivity = (has_known_activity  and ('subactivity' in pep)
+			and (pep['subactivity'] in ACTIVITIES[activity]))
+
+		if has_known_activity:
+			if has_known_subactivity:
+				subactivity = pep['subactivity']
+				return gtkgui_helpers.load_activity_icon(activity, subactivity).get_pixbuf()
+			else:
+				return gtkgui_helpers.load_activity_icon(activity).get_pixbuf()
+		else:
+			return gtkgui_helpers.load_activity_icon('unknown').get_pixbuf()
+
+	def asMarkupText(self):
+		assert not self._retracted
+		pep = self._pep_specific_data
+		activity = pep['activity']
+		subactivity = pep['subactivity'] if 'subactivity' in pep else None
+		text = pep['text'] if 'text' in pep else None
+
+		if activity in ACTIVITIES:
+			# Translate standard activities
+			if subactivity in ACTIVITIES[activity]:
+				subactivity = ACTIVITIES[activity][subactivity]
+			activity = ACTIVITIES[activity]['category']
+
+		markuptext = '<b>' + gobject.markup_escape_text(activity)
+		if subactivity:
+			markuptext += ': ' + gobject.markup_escape_text(subactivity)
+		markuptext += '</b>'
+		if text:
+			markuptext += ' (%s)' % gobject.markup_escape_text(text)
+		return markuptext
+
+
+class UserNicknamePEP(AbstractPEP):
+	'''XEP-0172: User Nickname'''
+
+	type = 'nickname'
+	namespace = xmpp.NS_NICK
+
+	def _extract_info(self, items):
+		nick = ''
+		for item in items.getTags('item'):
+			child = item.getTag('nick')
+			if child:
+				nick = child.getData()
+				break
+
+		retracted = items.getTag('retract') or not nick
+		return (nick, retracted)
+
+	def _update_contacts(self, jid, account):
+		nick = '' if self._retracted else self._pep_specific_data
+		for contact in gajim.contacts.get_contacts(account, jid):
+			contact.contact_name = nick
+
+	def _update_account(self, account):
+		if self._retracted:
+			gajim.nicks[account] = gajim.config.get_per('accounts', account, 'name')
+		else:
+			gajim.nicks[account] = self._pep_specific_data
+
+
+class UserLocationPEP(AbstractPEP):
+	'''XEP-0080: User Location'''
+
+	type = 'location'
+	namespace = xmpp.NS_LOCATION
+
+	def _extract_info(self, items):
+		location_dict = {}
+
+		for item in items.getTags('item'):
+			location_tag = item.getTag('geoloc')
+			if location_tag:
+				for child in location_tag.getChildren():
+					name = child.getName().strip()
+					data = child.getData().strip()
+					if child.getName() in LOCATION_DATA:
+						location_dict[name] = data
+
+		retracted = items.getTag('retract') or not location_dict
+		return (location_dict, retracted)
+
+	def _update_account(self, account):
+		AbstractPEP._update_account(self, account)
+		con = gajim.connections[account].location_info = \
+			self._pep_specific_data
+
+	def asPixbufIcon(self):
+		path = gtkgui_helpers.get_icon_path('gajim-earth')
+		return gtk.gdk.pixbuf_new_from_file(path)
+
+	def asMarkupText(self):
+		assert not self._retracted
+		location = self._pep_specific_data
+		location_string = ''
+
+		for entry in location.keys():
+			text = location[entry]
+			text = gobject.markup_escape_text(text)
+			location_string += '\n<b>%(tag)s</b>: %(text)s' % \
+				{'tag': entry.capitalize(), 'text': text}
+
+		return location_string.strip()
+
+
+SUPPORTED_PERSONAL_USER_EVENTS = [UserMoodPEP, UserTunePEP, UserActivityPEP,
+											 UserNicknamePEP, UserLocationPEP]
+
+class ConnectionPEP(object):
+
+	def __init__(self, account, dispatcher, pubsub_connection):
+		self._account = account
+		self._dispatcher = dispatcher
+		self._pubsub_connection = pubsub_connection
+
+	def _pubsubEventCB(self, xmpp_dispatcher, msg):
+		''' Called when we receive <message /> with pubsub event. '''
+		if not msg.getTag('event'):
+			return
+		if msg.getTag('error'):
+			log.debug('PubsubEventCB received error stanza. Ignoring')
+			raise xmpp.NodeProcessed
+
+		jid = helpers.get_full_jid_from_iq(msg)
+		event_tag = msg.getTag('event')
+
+		for pep_class in SUPPORTED_PERSONAL_USER_EVENTS:
+			pep = pep_class.get_tag_as_PEP(jid, self._account, event_tag)
+			if pep:
+				self._dispatcher.dispatch('PEP_RECEIVED', (jid, pep.type))
+
+		items = event_tag.getTag('items')
+		if items:
+			for item in items.getTags('item'):
+				entry = item.getTag('entry')
+				if entry:
+					# for each entry in feed (there shouldn't be more than one,
+					# but to be sure...
+					self._dispatcher.dispatch('ATOM_ENTRY',
+						(atom.OldEntry(node=entry),))
+
+		raise xmpp.NodeProcessed
+
+	def send_activity(self, activity, subactivity=None, message=None):
+		if not self.pep_supported:
+			return
+		item = xmpp.Node('activity', {'xmlns': xmpp.NS_ACTIVITY})
+		if activity:
+			i = item.addChild(activity)
+		if subactivity:
+			i.addChild(subactivity)
+		if message:
+			i = item.addChild('text')
+			i.addData(message)
+		self._pubsub_connection.send_pb_publish('', xmpp.NS_ACTIVITY, item, '0')
+
+	def retract_activity(self):
+		if not self.pep_supported:
+			return
+		self.send_activity(None)
+		# not all client support new XEP, so we still retract
+		self._pubsub_connection.send_pb_retract('', xmpp.NS_ACTIVITY, '0')
+
+	def send_mood(self, mood, message=None):
+		if not self.pep_supported:
+			return
+		item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD})
+		if mood:
+			item.addChild(mood)
+		if message:
+			i = item.addChild('text')
+			i.addData(message)
+		self._pubsub_connection.send_pb_publish('', xmpp.NS_MOOD, item, '0')
+
+	def retract_mood(self):
+		if not self.pep_supported:
+			return
+		self.send_mood(None)
+		# not all client support new XEP, so we still retract
+		self._pubsub_connection.send_pb_retract('', xmpp.NS_MOOD, '0')
+
+	def send_tune(self, artist='', title='', source='', track=0, length=0,
+	items=None):
+		if not self.pep_supported:
+			return
+		item = xmpp.Node('tune', {'xmlns': xmpp.NS_TUNE})
+		if artist:
+			i = item.addChild('artist')
+			i.addData(artist)
+		if title:
+			i = item.addChild('title')
+			i.addData(title)
+		if source:
+			i = item.addChild('source')
+			i.addData(source)
+		if track:
+			i = item.addChild('track')
+			i.addData(track)
+		if length:
+			i = item.addChild('length')
+			i.addData(length)
+		if items:
+			item.addChild(payload=items)
+		self._pubsub_connection.send_pb_publish('', xmpp.NS_TUNE, item, '0')
+
+	def retract_tune(self):
+		if not self.pep_supported:
+			return
+		self.send_tune(None)
+		# not all client support new XEP, so we still retract
+		self._pubsub_connection.send_pb_retract('', xmpp.NS_TUNE, '0')
+
+	def send_nickname(self, nick):
+		if not self.pep_supported:
+			return
+		item = xmpp.Node('nick', {'xmlns': xmpp.NS_NICK})
+		item.addData(nick)
+		self._pubsub_connection.send_pb_publish('', xmpp.NS_NICK, item, '0')
+
+	def retract_nickname(self):
+		if not self.pep_supported:
+			return
+		self.send_nickname(None)
+		# not all client support new XEP, so we still retract
+		self._pubsub_connection.send_pb_retract('', xmpp.NS_NICK, '0')
+
+	def send_location(self, info):
+		if not self.pep_supported:
+			return
+		item = xmpp.Node('geoloc', {'xmlns': xmpp.NS_LOCATION})
+		for field in LOCATION_DATA:
+			if info.get(field, None):
+				i = item.addChild(field)
+				i.addData(info[field])
+		self._pubsub_connection.send_pb_publish('', xmpp.NS_LOCATION, item, '0')
+
+	def retract_location(self):
+		if not self.pep_supported:
+			return
+		self.send_location({})
+		# not all client support new XEP, so we still retract
+		self._pubsub_connection.send_pb_retract('', xmpp.NS_LOCATION, '0')
 
 # vim: se ts=3:
diff --git a/src/common/protocol/__init__.py b/src/common/protocol/__init__.py
new file mode 100644
index 000000000..f50b2cd01
--- /dev/null
+++ b/src/common/protocol/__init__.py
@@ -0,0 +1,3 @@
+"""
+Implementations of specific XMPP protocols and XEPs
+"""
+\ No newline at end of file
diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py
new file mode 100644
index 000000000..ce0086b19
--- /dev/null
+++ b/src/common/protocol/bytestream.py
@@ -0,0 +1,650 @@
+# -*- coding:utf-8 -*-
+## src/common/connection_handlers.py
+##
+## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com>
+##                    Junglecow J <junglecow AT gmail.com>
+## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org>
+##                         Travis Shirk <travis AT pobox.com>
+##                         Nikos Kouremenos <kourem AT gmail.com>
+## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org>
+## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com>
+## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com>
+##                         Jean-Marie Traissard <jim AT lapin.org>
+##                         Stephan Erb <steve-e AT h3c.de>
+## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
+##
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 3 only.
+##
+## Gajim is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+##
+
+import socket
+
+from common import xmpp
+from common import gajim
+from common import helpers
+from common import dataforms
+
+from common.socks5 import Socks5Receiver
+
+
+def is_transfer_paused(file_props):
+	if 'stopped' in file_props and file_props['stopped']:
+		return False
+	if 'completed' in file_props and file_props['completed']:
+		return False
+	if 'disconnect_cb' not in file_props:
+		return False
+	return file_props['paused']
+
+def is_transfer_active(file_props):
+	if 'stopped' in file_props and file_props['stopped']:
+		return False
+	if 'completed' in file_props and file_props['completed']:
+		return False
+	if 'started' not in file_props or not file_props['started']:
+		return False
+	if 'paused' not in file_props:
+		return True
+	return not file_props['paused']
+
+def is_transfer_stopped(file_props):
+	if 'error' in file_props and file_props['error'] != 0:
+		return True
+	if 'completed' in file_props and file_props['completed']:
+		return True
+	if 'connected' in file_props and file_props['connected'] == False:
+		return True
+	if 'stopped' not in file_props or not file_props['stopped']:
+		return False
+	return True
+
+
+class ConnectionBytestream:
+
+	def __init__(self):
+		self.files_props = {}
+
+	def send_success_connect_reply(self, streamhost):
+		"""
+		Send reply to the initiator of FT that we made a connection
+		"""
+		if not self.connection or self.connected < 2:
+			return
+		if streamhost is None:
+			return None
+		iq = xmpp.Iq(to=streamhost['initiator'], typ='result',
+			frm=streamhost['target'])
+		iq.setAttr('id', streamhost['id'])
+		query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM)
+		stream_tag = query.setTag('streamhost-used')
+		stream_tag.setAttr('jid', streamhost['jid'])
+		self.connection.send(iq)
+
+	def stop_all_active_file_transfers(self, contact):
+		"""
+		Stop all active transfer to or from the given contact
+		"""
+		for file_props in self.files_props.values():
+			if is_transfer_stopped(file_props):
+				continue
+			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'])
+			if contact.get_full_jid() == sender_jid:
+				file_props['error'] = -3
+				self.remove_transfer(file_props)
+
+	def remove_all_transfers(self):
+		"""
+		Stop and remove all active connections from the socks5 pool
+		"""
+		for file_props in self.files_props.values():
+			self.remove_transfer(file_props, remove_from_list=False)
+		self.files_props = {}
+
+	def remove_transfer(self, file_props, remove_from_list=True):
+		if file_props is None:
+			return
+		self.disconnect_transfer(file_props)
+		sid = file_props['sid']
+		gajim.socks5queue.remove_file_props(self.name, sid)
+
+		if remove_from_list:
+			if 'sid' in self.files_props:
+				del(self.files_props['sid'])
+
+	def disconnect_transfer(self, file_props):
+		if file_props is None:
+			return
+		if 'hash' in file_props:
+			gajim.socks5queue.remove_sender(file_props['hash'])
+
+		if 'streamhosts' in file_props:
+			for host in file_props['streamhosts']:
+				if 'idx' in host and host['idx'] > 0:
+					gajim.socks5queue.remove_receiver(host['idx'])
+					gajim.socks5queue.remove_sender(host['idx'])
+
+	def _send_socks5_info(self, file_props):
+		"""
+		Send iq for the present streamhosts and proxies
+		"""
+		if not self.connection or self.connected < 2:
+			return
+		receiver = file_props['receiver']
+		sender = file_props['sender']
+
+		sha_str = helpers.get_auth_sha(file_props['sid'], sender, receiver)
+		file_props['sha_str'] = sha_str
+
+		port = gajim.config.get('file_transfers_port')
+		listener = gajim.socks5queue.start_listener(port, sha_str,
+			self._result_socks5_sid, file_props['sid'])
+		if not listener:
+			file_props['error'] = -5
+			self.dispatch('FILE_REQUEST_ERROR', (unicode(receiver), file_props, ''))
+			self._connect_error(unicode(receiver), file_props['sid'],
+				file_props['sid'], code=406)
+		else:
+			iq = xmpp.Iq(to=unicode(receiver), typ='set')
+			file_props['request-id'] = 'id_' + file_props['sid']
+			iq.setID(file_props['request-id'])
+			query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM)
+			query.setAttr('mode', 'plain')
+			query.setAttr('sid', file_props['sid'])
+
+			self._add_addiditional_streamhosts_to_query(query, file_props)
+			self._add_local_ips_as_streamhosts_to_query(query, file_props)
+			self._add_proxy_streamhosts_to_query(query, file_props)
+
+			self.connection.send(iq)
+
+	def _add_streamhosts_to_query(self, query, sender, port, hosts):
+		for host in hosts:
+			streamhost = xmpp.Node(tag='streamhost')
+			query.addChild(node=streamhost)
+			streamhost.setAttr('port', unicode(port))
+			streamhost.setAttr('host', host)
+			streamhost.setAttr('jid', sender)
+
+	def _add_local_ips_as_streamhosts_to_query(self, query, file_props):
+		try:
+			my_ips = [self.peerhost[0]] # The ip we're connected to server with
+			# all IPs from local DNS
+			for addr in socket.getaddrinfo(socket.gethostname(), None):
+				if not addr[4][0] in my_ips and not addr[4][0].startswith('127'):
+					my_ips.append(addr[4][0])
+
+			sender = file_props['sender']
+			port = gajim.config.get('file_transfers_port')
+			self._add_streamhosts_to_query(query, sender, port, my_ips)
+		except socket.gaierror:
+			self.dispatch('ERROR', (_('Wrong host'),
+				_('Invalid local address? :-O')))
+
+	def _add_addiditional_streamhosts_to_query(self, query, file_props):
+		sender = file_props['sender']
+		port = gajim.config.get('file_transfers_port')
+		ft_add_hosts_to_send = gajim.config.get('ft_add_hosts_to_send')
+		additional_hosts = []
+		if ft_add_hosts_to_send:
+			additional_hosts = [e.strip() for e in ft_add_hosts_to_send.split(',')]
+		else:
+			additional_hosts = []
+		self._add_streamhosts_to_query(query, sender, port, additional_hosts)
+
+	def _add_proxy_streamhosts_to_query(self, query, file_props):
+		proxyhosts = self._get_file_transfer_proxies_from_config(file_props)
+		if proxyhosts:
+			file_props['proxy_receiver'] = unicode(file_props['receiver'])
+			file_props['proxy_sender'] = unicode(file_props['sender'])
+			file_props['proxyhosts'] = proxyhosts
+
+			for proxyhost in proxyhosts:
+				self._add_streamhosts_to_query(query, proxyhost['jid'],
+				proxyhost['port'], [proxyhost['host']])
+
+	def _get_file_transfer_proxies_from_config(self, file_props):
+		configured_proxies = gajim.config.get_per('accounts', self.name,
+			'file_transfer_proxies')
+		shall_use_proxies = gajim.config.get_per('accounts', self.name,
+			'use_ft_proxies')
+		if shall_use_proxies and configured_proxies:
+			proxyhost_dicts = []
+			proxies = [item.strip() for item in configured_proxies.split(',')]
+			default_proxy = gajim.proxy65_manager.get_default_for_name(self.name)
+			if default_proxy:
+				# add/move default proxy at top of the others
+				if default_proxy in proxies:
+					proxies.remove(default_proxy)
+				proxies.insert(0, default_proxy)
+
+			for proxy in proxies:
+				(host, _port, jid) = gajim.proxy65_manager.get_proxy(proxy, self.name)
+				if not host:
+					continue
+				host_dict = {
+					'state': 0,
+					'target': unicode(file_props['receiver']),
+					'id': file_props['sid'],
+					'sid': file_props['sid'],
+					'initiator': proxy,
+					'host': host,
+					'port': unicode(_port),
+					'jid': jid
+				}
+				proxyhost_dicts.append(host_dict)
+			return proxyhost_dicts
+		else:
+			return []
+
+	def send_file_rejection(self, file_props, code='403', typ=None):
+		"""
+		Inform sender that we refuse to download the file
+
+		typ is used when code = '400', in this case typ can be 'strean' for
+		invalid stream or 'profile' for invalid profile
+		"""
+		# user response to ConfirmationDialog may come after we've disconneted
+		if not self.connection or self.connected < 2:
+			return
+		iq = xmpp.Iq(to=unicode(file_props['sender']), typ='error')
+		iq.setAttr('id', file_props['request-id'])
+		if code == '400' and typ in ('stream', 'profile'):
+			name = 'bad-request'
+			text = ''
+		else:
+			name = 'forbidden'
+			text = 'Offer Declined'
+		err = xmpp.ErrorNode(code=code, typ='cancel', name=name, text=text)
+		if code == '400' and typ in ('stream', 'profile'):
+			if typ == 'stream':
+				err.setTag('no-valid-streams', namespace=xmpp.NS_SI)
+			else:
+				err.setTag('bad-profile', namespace=xmpp.NS_SI)
+		iq.addChild(node=err)
+		self.connection.send(iq)
+
+	def send_file_approval(self, file_props):
+		"""
+		Send iq, confirming that we want to download the file
+		"""
+		# user response to ConfirmationDialog may come after we've disconneted
+		if not self.connection or self.connected < 2:
+			return
+		iq = xmpp.Iq(to=unicode(file_props['sender']), typ='result')
+		iq.setAttr('id', file_props['request-id'])
+		si = iq.setTag('si', namespace=xmpp.NS_SI)
+		if 'offset' in file_props and file_props['offset']:
+			file_tag = si.setTag('file', namespace=xmpp.NS_FILE)
+			range_tag = file_tag.setTag('range')
+			range_tag.setAttr('offset', file_props['offset'])
+		feature = si.setTag('feature', namespace=xmpp.NS_FEATURE)
+		_feature = xmpp.DataForm(typ='submit')
+		feature.addChild(node=_feature)
+		field = _feature.setField('stream-method')
+		field.delAttr('type')
+		field.setValue(xmpp.NS_BYTESTREAM)
+		self.connection.send(iq)
+
+	def _ft_get_our_jid(self):
+		our_jid = gajim.get_jid_from_account(self.name)
+		resource = self.server_resource
+		return our_jid + '/' + resource
+
+	def _ft_get_receiver_jid(self, file_props):
+		return file_props['receiver'].jid + '/' + file_props['receiver'].resource
+
+	def send_file_request(self, file_props):
+		"""
+		Send iq for new FT request
+		"""
+		if not self.connection or self.connected < 2:
+			return
+		file_props['sender'] = self._ft_get_our_jid()
+		fjid = self._ft_get_receiver_jid(file_props)
+		iq = xmpp.Iq(to=fjid, typ='set')
+		iq.setID(file_props['sid'])
+		self.files_props[file_props['sid']] = file_props
+		si = iq.setTag('si', namespace=xmpp.NS_SI)
+		si.setAttr('profile', xmpp.NS_FILE)
+		si.setAttr('id', file_props['sid'])
+		file_tag = si.setTag('file', namespace=xmpp.NS_FILE)
+		file_tag.setAttr('name', file_props['name'])
+		file_tag.setAttr('size', file_props['size'])
+		desc = file_tag.setTag('desc')
+		if 'desc' in file_props:
+			desc.setData(file_props['desc'])
+		file_tag.setTag('range')
+		feature = si.setTag('feature', namespace=xmpp.NS_FEATURE)
+		_feature = xmpp.DataForm(typ='form')
+		feature.addChild(node=_feature)
+		field = _feature.setField('stream-method')
+		field.setAttr('type', 'list-single')
+		field.addOption(xmpp.NS_BYTESTREAM)
+		self.connection.send(iq)
+
+	def _result_socks5_sid(self, sid, hash_id):
+		"""
+		Store the result of SHA message from auth
+		"""
+		if sid not in self.files_props:
+			return
+		file_props = self.files_props[sid]
+		file_props['hash'] = hash_id
+		return
+
+	def _connect_error(self, to, _id, sid, code=404):
+		"""
+		Called when there is an error establishing BS connection, or when
+		connection is rejected
+		"""
+		if not self.connection or self.connected < 2:
+			return
+		msg_dict = {
+			404: 'Could not connect to given hosts',
+			405: 'Cancel',
+			406: 'Not acceptable',
+		}
+		msg = msg_dict[code]
+		iq = xmpp.Iq(to=to, 	typ='error')
+		iq.setAttr('id', _id)
+		err = iq.setTag('error')
+		err.setAttr('code', unicode(code))
+		err.setData(msg)
+		self.connection.send(iq)
+		if code == 404:
+			file_props = gajim.socks5queue.get_file_props(self.name, sid)
+			if file_props is not None:
+				self.disconnect_transfer(file_props)
+				file_props['error'] = -3
+				self.dispatch('FILE_REQUEST_ERROR', (to, file_props, msg))
+
+	def _proxy_auth_ok(self, proxy):
+		"""
+		Called after authentication to proxy server
+		"""
+		if not self.connection or self.connected < 2:
+			return
+		file_props = self.files_props[proxy['sid']]
+		iq = xmpp.Iq(to=proxy['initiator'], 	typ='set')
+		auth_id = "au_" + proxy['sid']
+		iq.setID(auth_id)
+		query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM)
+		query.setAttr('sid', proxy['sid'])
+		activate = query.setTag('activate')
+		activate.setData(file_props['proxy_receiver'])
+		iq.setID(auth_id)
+		self.connection.send(iq)
+
+	# register xmpppy handlers for bytestream and FT stanzas
+	def _bytestreamErrorCB(self, con, iq_obj):
+		id_ = unicode(iq_obj.getAttr('id'))
+		frm = helpers.get_full_jid_from_iq(iq_obj)
+		query = iq_obj.getTag('query')
+		gajim.proxy65_manager.error_cb(frm, query)
+		jid = helpers.get_jid_from_iq(iq_obj)
+		id_ = id_[3:]
+		if id_ not in self.files_props:
+			return
+		file_props = self.files_props[id_]
+		file_props['error'] = -4
+		self.dispatch('FILE_REQUEST_ERROR', (jid, file_props, ''))
+		raise xmpp.NodeProcessed
+
+	def _ft_get_from(self, iq_obj):
+		return helpers.get_full_jid_from_iq(iq_obj)
+
+	def _bytestreamSetCB(self, con, iq_obj):
+		target = unicode(iq_obj.getAttr('to'))
+		id_ = unicode(iq_obj.getAttr('id'))
+		query = iq_obj.getTag('query')
+		sid = unicode(query.getAttr('sid'))
+		file_props = gajim.socks5queue.get_file_props(self.name, sid)
+		streamhosts = []
+		for item in query.getChildren():
+			if item.getName() == 'streamhost':
+				host_dict = {
+					'state': 0,
+					'target': target,
+					'id': id_,
+					'sid': sid,
+					'initiator': self._ft_get_from(iq_obj)
+				}
+				for attr in item.getAttrs():
+					host_dict[attr] = item.getAttr(attr)
+				streamhosts.append(host_dict)
+		if file_props is None:
+			if sid in self.files_props:
+				file_props = self.files_props[sid]
+				file_props['fast'] = streamhosts
+				if file_props['type'] == 's': # FIXME: remove fast xmlns
+					# only psi do this
+					if 'streamhosts' in file_props:
+						file_props['streamhosts'].extend(streamhosts)
+					else:
+						file_props['streamhosts'] = streamhosts
+					if not gajim.socks5queue.get_file_props(self.name, sid):
+						gajim.socks5queue.add_file_props(self.name, file_props)
+					gajim.socks5queue.connect_to_hosts(self.name, sid,
+						self.send_success_connect_reply, None)
+				raise xmpp.NodeProcessed
+
+		file_props['streamhosts'] = streamhosts
+		if file_props['type'] == 'r':
+			gajim.socks5queue.connect_to_hosts(self.name, sid,
+				self.send_success_connect_reply, self._connect_error)
+		raise xmpp.NodeProcessed
+
+	def _ResultCB(self, con, iq_obj):
+		# if we want to respect xep-0065 we have to check for proxy
+		# activation result in any result iq
+		real_id = unicode(iq_obj.getAttr('id'))
+		if not real_id.startswith('au_'):
+			return
+		frm = self._ft_get_from(iq_obj)
+		id_ = real_id[3:]
+		if id_ in self.files_props:
+			file_props = self.files_props[id_]
+			if file_props['streamhost-used']:
+				for host in file_props['proxyhosts']:
+					if host['initiator'] == frm and 'idx' in host:
+						gajim.socks5queue.activate_proxy(host['idx'])
+						raise xmpp.NodeProcessed
+
+	def _ft_get_streamhost_jid_attr(self, streamhost):
+		return helpers.parse_jid(streamhost.getAttr('jid'))
+
+	def _bytestreamResultCB(self, con, iq_obj):
+		frm = self._ft_get_from(iq_obj)
+		real_id = unicode(iq_obj.getAttr('id'))
+		query = iq_obj.getTag('query')
+		gajim.proxy65_manager.resolve_result(frm, query)
+
+		try:
+			streamhost = query.getTag('streamhost-used')
+		except Exception: # this bytestream result is not what we need
+			pass
+		id_ = real_id[3:]
+		if id_ in self.files_props:
+			file_props = self.files_props[id_]
+		else:
+			raise xmpp.NodeProcessed
+		if streamhost is None:
+			# proxy approves the activate query
+			if real_id.startswith('au_'):
+				if 'streamhost-used' not in file_props or \
+				file_props['streamhost-used'] is False:
+					raise xmpp.NodeProcessed
+				if 'proxyhosts' not in file_props:
+					raise xmpp.NodeProcessed
+				for host in file_props['proxyhosts']:
+					if host['initiator'] == frm and \
+					unicode(query.getAttr('sid')) == file_props['sid']:
+						gajim.socks5queue.activate_proxy(host['idx'])
+						break
+			raise xmpp.NodeProcessed
+		jid = self._ft_get_streamhost_jid_attr(streamhost)
+		if 'streamhost-used' in file_props and \
+			file_props['streamhost-used'] is True:
+			raise xmpp.NodeProcessed
+
+		if real_id.startswith('au_'):
+			if 'stopped' in file and file_props['stopped']:
+				self.remove_transfer(file_props)
+			else:
+				gajim.socks5queue.send_file(file_props, self.name)
+			raise xmpp.NodeProcessed
+
+		proxy = None
+		if 'proxyhosts' in file_props:
+			for proxyhost in file_props['proxyhosts']:
+				if proxyhost['jid'] == jid:
+					proxy = proxyhost
+
+		if proxy is not None:
+			file_props['streamhost-used'] = True
+			if 'streamhosts' not in file_props:
+				file_props['streamhosts'] = []
+			file_props['streamhosts'].append(proxy)
+			file_props['is_a_proxy'] = True
+			receiver = Socks5Receiver(gajim.idlequeue, proxy,
+				file_props['sid'], file_props)
+			gajim.socks5queue.add_receiver(self.name, receiver)
+			proxy['idx'] = receiver.queue_idx
+			gajim.socks5queue.on_success = self._proxy_auth_ok
+			raise xmpp.NodeProcessed
+
+		else:
+			if 'stopped' in file_props and file_props['stopped']:
+				self.remove_transfer(file_props)
+			else:
+				gajim.socks5queue.send_file(file_props, self.name)
+			if 'fast' in file_props:
+				fasts = file_props['fast']
+				if len(fasts) > 0:
+					self._connect_error(frm, fasts[0]['id'], file_props['sid'],
+						code=406)
+
+		raise xmpp.NodeProcessed
+
+	def _siResultCB(self, con, iq_obj):
+		file_props = self.files_props.get(iq_obj.getAttr('id'))
+		if not file_props:
+			return
+		if 'request-id' in file_props:
+			# we have already sent streamhosts info
+			return
+		file_props['receiver'] = self._ft_get_from(iq_obj)
+		si = iq_obj.getTag('si')
+		file_tag = si.getTag('file')
+		range_tag = None
+		if file_tag:
+			range_tag = file_tag.getTag('range')
+		if range_tag:
+			offset = range_tag.getAttr('offset')
+			if offset:
+				file_props['offset'] = int(offset)
+			length = range_tag.getAttr('length')
+			if length:
+				file_props['length'] = int(length)
+		feature = si.setTag('feature')
+		if feature.getNamespace() != xmpp.NS_FEATURE:
+			return
+		form_tag = feature.getTag('x')
+		form = xmpp.DataForm(node=form_tag)
+		field = form.getField('stream-method')
+		if field.getValue() != xmpp.NS_BYTESTREAM:
+			return
+		self._send_socks5_info(file_props)
+		raise xmpp.NodeProcessed
+
+	def _siSetCB(self, con, iq_obj):
+		jid = self._ft_get_from(iq_obj)
+		file_props = {'type': 'r'}
+		file_props['sender'] = jid
+		file_props['request-id'] = unicode(iq_obj.getAttr('id'))
+		si = iq_obj.getTag('si')
+		profile = si.getAttr('profile')
+		mime_type = si.getAttr('mime-type')
+		if profile != xmpp.NS_FILE:
+			self.send_file_rejection(file_props, code='400', typ='profile')
+			raise xmpp.NodeProcessed
+		feature_tag = si.getTag('feature', namespace=xmpp.NS_FEATURE)
+		if not feature_tag:
+			return
+		form_tag = feature_tag.getTag('x', namespace=xmpp.NS_DATA)
+		if not form_tag:
+			return
+		form = dataforms.ExtendForm(node=form_tag)
+		for f in form.iter_fields():
+			if f.var == 'stream-method' and f.type == 'list-single':
+				values = [o[1] for o in f.options]
+				if xmpp.NS_BYTESTREAM in values:
+					break
+		else:
+			self.send_file_rejection(file_props, code='400', typ='stream')
+			raise xmpp.NodeProcessed
+		file_tag = si.getTag('file')
+		for attribute in file_tag.getAttrs():
+			if attribute in ('name', 'size', 'hash', 'date'):
+				val = file_tag.getAttr(attribute)
+				if val is None:
+					continue
+				file_props[attribute] = val
+		file_desc_tag = file_tag.getTag('desc')
+		if file_desc_tag is not None:
+			file_props['desc'] = file_desc_tag.getData()
+
+		if mime_type is not None:
+			file_props['mime-type'] = mime_type
+		file_props['receiver'] = self._ft_get_our_jid()
+		file_props['sid'] = unicode(si.getAttr('id'))
+		file_props['transfered_size'] = []
+		gajim.socks5queue.add_file_props(self.name, file_props)
+		self.dispatch('FILE_REQUEST', (jid, file_props))
+		raise xmpp.NodeProcessed
+
+	def _siErrorCB(self, con, iq_obj):
+		si = iq_obj.getTag('si')
+		profile = si.getAttr('profile')
+		if profile != xmpp.NS_FILE:
+			return
+		file_props = self.files_props.get(iq_obj.getAttr('id'))
+		if not file_props:
+			return
+		jid = self._ft_get_from(iq_obj)
+		file_props['error'] = -3
+		self.dispatch('FILE_REQUEST_ERROR', (jid, file_props, ''))
+		raise xmpp.NodeProcessed
+
+
+class ConnectionBytestreamZeroconf(ConnectionBytestream):
+
+	def _ft_get_from(self, iq_obj):
+		return unicode(iq_obj.getFrom())
+
+	def _ft_get_our_jid(self):
+		return gajim.get_jid_from_account(self.name)
+
+	def _ft_get_receiver_jid(self, file_props):
+		return file_props['receiver'].jid
+
+	def _ft_get_streamhost_jid_attr(self, streamhost):
+		return streamhost.getAttr('jid')
+
+# vim: se ts=3:
diff --git a/src/common/protocol/caps.py b/src/common/protocol/caps.py
new file mode 100644
index 000000000..3fd6c1386
--- /dev/null
+++ b/src/common/protocol/caps.py
@@ -0,0 +1,111 @@
+# -*- coding:utf-8 -*-
+## src/common/protocol/caps.py
+##
+## Copyright (C) 2009 Stephan Erb <steve-e AT h3c.de>
+##
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 3 only.
+##
+## Gajim is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+##
+
+"""
+Module containing the network portion of XEP-115 (Entity Capabilities)
+"""
+
+import logging
+log = logging.getLogger('gajim.c.p.caps')
+
+from common.xmpp import NS_CAPS
+from common import gajim
+from common import helpers
+
+
+class ConnectionCaps(object):
+
+	def __init__(self, account, dispatch_event, capscache, client_caps_factory):
+		self._account = account
+		self._dispatch_event = dispatch_event
+		self._capscache = capscache
+		self._create_suitable_client_caps = client_caps_factory
+
+	def _capsPresenceCB(self, con, presence):
+		"""
+		XMMPPY callback method to handle retrieved caps info
+		"""
+		try:
+			jid = helpers.get_full_jid_from_iq(presence)
+		except:
+			log.info("Ignoring invalid JID in caps presenceCB")
+			return
+
+		client_caps = self._extract_client_caps_from_presence(presence)
+		self._capscache.query_client_of_jid_if_unknown(self, jid, client_caps)
+		self._update_client_caps_of_contact(jid, client_caps)
+
+		self._dispatch_event('CAPS_RECEIVED', (jid,))
+
+	def _extract_client_caps_from_presence(self, presence):
+		caps_tag = presence.getTag('c', namespace=NS_CAPS)
+		if caps_tag:
+			hash_method, node, caps_hash = caps_tag['hash'], caps_tag['node'], caps_tag['ver']
+		else:
+			hash_method = node = caps_hash = None
+		return self._create_suitable_client_caps(node, caps_hash, hash_method)
+
+	def _update_client_caps_of_contact(self, jid, client_caps):
+		contact = self._get_contact_or_gc_contact_for_jid(jid)
+		if contact:
+			contact.client_caps = client_caps
+		else:
+			log.info("Received Caps from unknown contact %s" % jid)
+
+	def _get_contact_or_gc_contact_for_jid(self, jid):
+		contact = gajim.contacts.get_contact_from_full_jid(self._account, jid)
+		if contact is None:
+			room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
+			contact = gajim.contacts.get_gc_contact(self._account, room_jid, nick)
+		return contact
+
+	def _capsDiscoCB(self, jid, node, identities, features, dataforms):
+		"""
+		XMMPPY callback to update our caps cache with queried information after
+		we have retrieved an unknown caps hash and issued a disco
+		"""
+		contact = self._get_contact_or_gc_contact_for_jid(jid)
+		if not contact:
+			log.info("Received Disco from unknown contact %s" % jid)
+			return
+
+		lookup = contact.client_caps.get_cache_lookup_strategy()
+		cache_item = lookup(self._capscache)
+
+		if cache_item.is_valid():
+			# we already know that the hash is fine and have already cached
+			# the identities and features
+			return
+		else:
+			validate = contact.client_caps.get_hash_validation_strategy()
+			hash_is_valid = validate(identities, features, dataforms)
+
+			if hash_is_valid:
+				cache_item.set_and_store(identities, features)
+			else:
+				node = caps_hash = hash_method = None
+				contact.client_caps = self._create_suitable_client_caps(node,
+					caps_hash, hash_method)
+				log.warn("Computed and retrieved caps hash differ." +
+					"Ignoring caps of contact %s" % contact.get_full_jid())
+
+			self._dispatch_event('CAPS_RECEIVED', (jid,))
+		
+# vim: se ts=3:
diff --git a/src/common/proxy65_manager.py b/src/common/proxy65_manager.py
index b1bbea79d..5c4420839 100644
--- a/src/common/proxy65_manager.py
+++ b/src/common/proxy65_manager.py
@@ -41,10 +41,13 @@ S_FINISHED = 4
 CONNECT_TIMEOUT = 20
 
 class Proxy65Manager:
-	''' keep records for file transfer proxies. Each time account
-	establishes a connection to its server call proxy65manger.resolve(proxy)
-	for every proxy that is convigured within the account. The class takes
-	care to resolve and test each proxy only once.'''
+	"""
+	Keep records for file transfer proxies. Each time account establishes a
+	connection to its server call proxy65manger.resolve(proxy) for every proxy
+	that is convigured within the account. The class takes care to resolve and
+	test each proxy only once
+	"""
+
 	def __init__(self, idlequeue):
 		# dict {proxy: proxy properties}
 		self.idlequeue = idlequeue
@@ -53,7 +56,9 @@ class Proxy65Manager:
 		self.default_proxies = {}
 
 	def resolve(self, proxy, connection, sender_jid, default=None):
-		''' start '''
+		"""
+		Start
+		"""
 		if proxy in self.proxies:
 			resolver = self.proxies[proxy]
 		else:
@@ -102,7 +107,9 @@ class Proxy65Manager:
 
 class ProxyResolver:
 	def resolve_result(self, host, port, jid):
-		''' test if host has a real proxy65 listening on port '''
+		"""
+		Test if host has a real proxy65 listening on port
+		"""
 		self.host = str(host)
 		self.port = int(port)
 		self.jid = unicode(jid)
@@ -175,19 +182,25 @@ class ProxyResolver:
 				self.try_next_connection()
 
 	def try_next_connection(self):
-		''' try to resolve proxy with the next possible connection '''
+		"""
+		Try to resolve proxy with the next possible connection
+		"""
 		if self.connections:
 			connection = self.connections.pop(0)
 			self.start_resolve(connection)
 
 	def add_connection(self, connection):
-		''' add a new connection in case the first fails '''
+		"""
+		Add a new connection in case the first fails
+		"""
 		self.connections.append(connection)
 		if self.state == S_INITIAL:
 			self.start_resolve(connection)
 
 	def start_resolve(self, connection):
-		''' request network address from proxy '''
+		"""
+		Request network address from proxy
+		"""
 		self.state = S_STARTED
 		self.active_connection = connection
 		iq = common.xmpp.Protocol(name='iq', to=self.proxy, typ='get')
@@ -209,10 +222,16 @@ class ProxyResolver:
 		self.sender_jid = sender_jid
 
 class HostTester(Socks5, IdleObject):
-	''' fake proxy tester. '''
+	"""
+	Fake proxy tester
+	"""
+
 	def __init__(self, host, port, jid, sid, sender_jid, on_success, on_failure):
-		''' try to establish and auth to proxy at (host, port)
-		call on_success, or on_failure according to the result'''
+		"""
+		Try to establish and auth to proxy at (host, port)
+
+		Calls on_success, or on_failure according to the result.
+		"""
 		self.host = host
 		self.port = port
 		self.jid = jid
@@ -226,7 +245,9 @@ class HostTester(Socks5, IdleObject):
 		self.sid = sid
 
 	def connect(self):
-		''' create the socket and plug it to the idlequeue '''
+		"""
+		Create the socket and plug it to the idlequeue
+		"""
 		if self.host is None:
 			self.on_failure()
 			return None
@@ -320,10 +341,16 @@ class HostTester(Socks5, IdleObject):
 		return
 
 class ReceiverTester(Socks5, IdleObject):
-	''' fake proxy tester. '''
+	"""
+	Fake proxy tester
+	"""
+
 	def __init__(self, host, port, jid, sid, sender_jid, on_success, on_failure):
-		''' try to establish and auth to proxy at (host, port)
-		call on_success, or on_failure according to the result'''
+		"""
+		Try to establish and auth to proxy at (host, port)
+
+		Call on_success, or on_failure according to the result.
+		"""
 		self.host = host
 		self.port = port
 		self.jid = jid
@@ -337,7 +364,9 @@ class ReceiverTester(Socks5, IdleObject):
 		self.sid = sid
 
 	def connect(self):
-		''' create the socket and plug it to the idlequeue '''
+		"""
+		Create the socket and plug it to the idlequeue
+		"""
 		if self.host is None:
 			self.on_failure()
 			return None
diff --git a/src/common/pubsub.py b/src/common/pubsub.py
index 8f65ff1a8..d2dbf88e1 100644
--- a/src/common/pubsub.py
+++ b/src/common/pubsub.py
@@ -67,7 +67,9 @@ class ConnectionPubSub:
 		self.__callbacks[id_]=(cb, args, kwargs)
 
 	def send_pb_publish(self, jid, node, item, id_, options=None):
-		'''Publish item to a node.'''
+		"""
+		Publish item to a node
+		"""
 		if not self.connection or self.connected < 2:
 			return
 		query = xmpp.Iq('set', to=jid)
@@ -80,20 +82,24 @@ class ConnectionPubSub:
 
 		self.connection.send(query)
 
-	def send_pb_retrieve(self, jid, node, cb=None, *args, **kwargs): 
-		'''Get items from a node''' 
-		if not self.connection or self.connected < 2: 
-			return 
-		query = xmpp.Iq('get', to=jid) 
-		r = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) 
-		r = r.addChild('items', {'node': node}) 
+	def send_pb_retrieve(self, jid, node, cb=None, *args, **kwargs):
+		"""
+		Get items from a node
+		"""
+		if not self.connection or self.connected < 2:
+			return
+		query = xmpp.Iq('get', to=jid)
+		r = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB)
+		r = r.addChild('items', {'node': node})
 		id_ = self.connection.send(query)
 
 		if cb:
 			self.__callbacks[id_]=(cb, args, kwargs)
 
 	def send_pb_retract(self, jid, node, id_):
-		'''Delete item from a node'''
+		"""
+		Delete item from a node
+		"""
 		if not self.connection or self.connected < 2:
 			return
 		query = xmpp.Iq('set', to=jid)
@@ -104,7 +110,9 @@ class ConnectionPubSub:
 		self.connection.send(query)
 
 	def send_pb_delete(self, jid, node):
-		'''Deletes node.'''
+		"""
+		Delete node
+		"""
 		if not self.connection or self.connected < 2:
 			return
 		query = xmpp.Iq('set', to=jid)
@@ -122,7 +130,9 @@ class ConnectionPubSub:
 			'node': node})
 
 	def send_pb_create(self, jid, node, configure = False, configure_form = None):
-		'''Creates new node.'''
+		"""
+		Create a new node
+		"""
 		if not self.connection or self.connected < 2:
 			return
 		query = xmpp.Iq('set', to=jid)
diff --git a/src/common/resolver.py b/src/common/resolver.py
index b11abcd98..3e696e110 100644
--- a/src/common/resolver.py
+++ b/src/common/resolver.py
@@ -23,8 +23,14 @@ import re
 import logging
 log = logging.getLogger('gajim.c.resolver')
 
+if __name__ == '__main__':
+	sys.path.append('..')
+	from common import i18n
+	import common.configpaths
+	common.configpaths.gajimpaths.init(None)
+
 from common import helpers
-from xmpp.idlequeue import IdleCommand
+from common.xmpp.idlequeue import IdleCommand
 
 # it is good to check validity of arguments, when calling system commands
 ns_type_pattern = re.compile('^[a-z]+$')
@@ -56,6 +62,7 @@ class CommonResolver():
 		self.handlers = {}
 
 	def resolve(self, host, on_ready, type='srv'):
+		log.debug('resolve %s type=%s' % (host, type))
 		assert(type in ['srv', 'txt'])
 		if not host:
 			# empty host, return empty list of srv records
@@ -63,19 +70,23 @@ class CommonResolver():
 			return
 		if self.resolved_hosts.has_key(host+type):
 			# host is already resolved, return cached values
+			log.debug('%s already resolved: %s')
 			on_ready(host, self.resolved_hosts[host+type])
 			return
 		if self.handlers.has_key(host+type):
 			# host is about to be resolved by another connection,
 			# attach our callback
+			log.debug('already resolving %s' % host)
 			self.handlers[host+type].append(on_ready)
 		else:
 			# host has never been resolved, start now
+			log.debug('Starting to resolve %s using %s' % (host, self))
 			self.handlers[host+type] = [on_ready]
 			self.start_resolve(host, type)
 
 	def _on_ready(self, host, type, result_list):
 		# practically it is impossible to be the opposite, but who knows :)
+		log.debug('Resolving result for %s: %s' % (host, result_list))
 		if not self.resolved_hosts.has_key(host+type):
 			self.resolved_hosts[host+type] = result_list
 		if self.handlers.has_key(host+type):
@@ -88,11 +99,12 @@ class CommonResolver():
 
 # FIXME: API usage is not consistent! This one requires that process is called
 class LibAsyncNSResolver(CommonResolver):
-	'''
+	"""
 	Asynchronous resolver using libasyncns-python. process() method has to be
-	called in order to proceed the pending requests.
-	Based on patch submitted by Damien Thebault.
-	'''
+	called in order to proceed the pending requests. Based on patch submitted by
+	Damien Thebault.
+	"""
+
 	def __init__(self):
 		self.asyncns = libasyncns.Asyncns()
 		CommonResolver.__init__(self)
@@ -125,18 +137,23 @@ class LibAsyncNSResolver(CommonResolver):
 			while resq is not None:
 				try:
 					rl = resq.get_done()
-				except:
+				except Exception:
 					rl = []
+				hosts = []
+				requested_type = resq.userdata['type']
+				requested_host = resq.userdata['host']
 				if rl:
 					for r in rl:
+						if r['type'] != requested_type:
+							# Answer doesn't contain valid SRV data
+							continue
 						r['prio'] = r['pref']
-				self._on_ready(
-					host = resq.userdata['host'],
-					type = resq.userdata['type'],
-					result_list = rl)
+						hosts.append(r)
+				self._on_ready(host=requested_host, type=requested_type,
+					result_list=hosts)
 				try:
 					resq = self.asyncns.get_next()
-				except:
+				except Exception:
 					resq = None
 		elif type(resq) == libasyncns.AddrInfoQuery:
 			# getaddrinfo result (A or AAAA)
@@ -146,20 +163,22 @@ class LibAsyncNSResolver(CommonResolver):
 
 
 class NSLookupResolver(CommonResolver):
-	'''
+	"""
 	Asynchronous DNS resolver calling nslookup. Processing of pending requests
-	is invoked from idlequeue which is watching file descriptor of pipe of stdout
-	of nslookup process.
-	'''
+	is invoked from idlequeue which is watching file descriptor of pipe of
+	stdout of nslookup process.
+	"""
+
 	def __init__(self, idlequeue):
 		self.idlequeue = idlequeue
 		self.process = False
 		CommonResolver.__init__(self)
 
 	def parse_srv_result(self, fqdn, result):
-		''' parse the output of nslookup command and return list of
-		properties: 'host', 'port','weight', 'priority'	corresponding to the found
-		srv hosts '''
+		"""
+		Parse the output of nslookup command and return list of properties:
+		'host', 'port','weight', 'priority'	corresponding to the found srv hosts
+		"""
 		if os.name == 'nt':
 			return self._parse_srv_result_nt(fqdn, result)
 		elif os.name == 'posix':
@@ -260,7 +279,9 @@ class NSLookupResolver(CommonResolver):
 		CommonResolver._on_ready(self, host, type, result_list)
 
 	def start_resolve(self, host, type):
-		''' spawn new nslookup process and start waiting for results '''
+		"""
+		Spawn new nslookup process and start waiting for results
+		"""
 		ns = NsLookup(self._on_ready, host, type)
 		ns.set_idlequeue(self.idlequeue)
 		ns.commandtimeout = 10
@@ -319,6 +340,8 @@ if __name__ == '__main__':
 	win.add(hbox)
 	win.show_all()
 	gobject.timeout_add(200, idlequeue.process)
+	if USE_LIBASYNCNS:
+		gobject.timeout_add(200, resolver.process)
 	gtk.main()
 
 # vim: se ts=3:
diff --git a/src/common/rst_xhtml_generator.py b/src/common/rst_xhtml_generator.py
index 8f57bb698..7211e8a1d 100644
--- a/src/common/rst_xhtml_generator.py
+++ b/src/common/rst_xhtml_generator.py
@@ -33,17 +33,19 @@ except ImportError:
 		return None
 else:
 	def pos_int_validator(text):
-		"""Validates that text can be evaluated as a positive integer."""
+		"""
+		Validates that text can be evaluated as a positive integer
+		"""
 		result = int(text)
 		if result < 0:
 			raise ValueError("Error: value '%(text)s' "
 							"must be a positive integer")
 		return result
 
-	def generate_uri_role( role_name, aliases,
-					anchor_text, base_url,
-					interpret_url, validator):
-		'''Creates and register a uri based "interpreted role".
+	def generate_uri_role( role_name, aliases, anchor_text, base_url,
+			interpret_url, validator):
+		"""
+		Create and register a uri based "interpreted role"
 
 		Those are similar to the RFC, and PEP ones, and take
 		role_name:
@@ -58,7 +60,7 @@ else:
 			this, modulo the validated text, will be added to it
 		validator:
 			should return the validated text, or raise ValueError
-		'''
+		"""
 		def uri_reference_role(role, rawtext, text, lineno, inliner,
 			options={}, content=[]):
 			try:
@@ -94,15 +96,15 @@ else:
 				pos_int_validator)
 
 	class HTMLGenerator:
-		'''Really simple HTMLGenerator starting from publish_parts.
+		"""
+		Really simple HTMLGenerator starting from publish_parts
 
 		It reuses the docutils.core.Publisher class, which means it is *not*
 		threadsafe.
-		'''
-		def __init__(self,
-			settings_spec=None,
-			settings_overrides=dict(report_level=5, halt_level=5),
-			config_section='general'):
+		"""
+		def __init__(self, settings_spec=None,
+				settings_overrides=dict(report_level=5, halt_level=5),
+				config_section='general'):
 			self.pub = Publisher(reader=None, parser=None, writer=None,
 				settings=None,
 				source_class=io.StringInput,
@@ -124,13 +126,12 @@ else:
 				config_section)
 
 
-		def create_xhtml(self, text,
-			destination=None,
-			destination_path=None,
-			enable_exit_status=None):
-			''' Create xhtml for a fragment of IM dialog.
-			We can use the source_name to store info about
-			the message.'''
+		def create_xhtml(self, text, destination=None, destination_path=None,
+				enable_exit_status=None):
+			"""
+			Create xhtml for a fragment of IM dialog. We can use the source_name
+			to store info about the message
+			"""
 			self.pub.set_source(text, None)
 			self.pub.set_destination(destination, destination_path)
 			output = self.pub.publish(enable_exit_status=enable_exit_status)
diff --git a/src/common/sleepy.py b/src/common/sleepy.py
index 507452ea9..0116faefb 100644
--- a/src/common/sleepy.py
+++ b/src/common/sleepy.py
@@ -66,7 +66,9 @@ class SleepyWindows:
 		return idleDelta
 
 	def poll(self):
-		'''checks to see if we should change state'''
+		"""
+		Check to see if we should change state
+		"""
 		if not SUPPORTED:
 			return False
 
@@ -113,7 +115,9 @@ class SleepyUnix:
 		return idle.getIdleSec()
 
 	def poll(self):
-		'''checks to see if we should change state'''
+		"""
+		Check to see if we should change state
+		"""
 		if not SUPPORTED:
 			return False
 
diff --git a/src/common/socks5.py b/src/common/socks5.py
index e1c1099ad..f3c1a5b5e 100644
--- a/src/common/socks5.py
+++ b/src/common/socks5.py
@@ -33,6 +33,7 @@ from errno import ENOBUFS
 from errno import EINTR
 from errno import EISCONN
 from errno import EINPROGRESS
+from errno import EAFNOSUPPORT
 from xmpp.idlequeue import IdleObject
 MAX_BUFF_LEN = 65536
 
@@ -52,9 +53,12 @@ READ_TIMEOUT = 180
 SEND_TIMEOUT = 180
 
 class SocksQueue:
-	''' queue for all file requests objects '''
+	"""
+	Queue for all file requests objects
+	"""
+
 	def __init__(self, idlequeue, complete_transfer_cb=None,
-	progress_transfer_cb=None, error_cb=None):
+			progress_transfer_cb=None, error_cb=None):
 		self.connected = 0
 		self.readers = {}
 		self.files_props = {}
@@ -72,9 +76,10 @@ class SocksQueue:
 		self.on_failure = None
 
 	def start_listener(self, port, sha_str, sha_handler, sid):
-		''' start waiting for incomming connections on (host, port)
-		and do a socks5 authentication using sid for generated sha
-		'''
+		"""
+		Start waiting for incomming connections on (host, port) and do a socks5
+		authentication using sid for generated SHA
+		"""
 		self.sha_handlers[sha_str] = (sha_handler, sid)
 		if self.listener is None:
 			self.listener = Socks5Listener(self.idlequeue, port)
@@ -121,8 +126,10 @@ class SocksQueue:
 			streamhost['idx'] = receiver.queue_idx
 
 	def _socket_connected(self, streamhost, file_props):
-		''' called when there is a host connected to one of the
-		senders's streamhosts. Stop othere attempts for connections '''
+		"""
+		Called when there is a host connected to one of the senders's
+		streamhosts. Stop othere attempts for connections
+		"""
 		for host in file_props['streamhosts']:
 			if host != streamhost and 'idx' in host:
 				if host['state'] == 1:
@@ -137,10 +144,11 @@ class SocksQueue:
 					host['state'] = -2
 
 	def reconnect_receiver(self, receiver, streamhost):
-		''' Check the state of all streamhosts and if all has failed, then
-		emit connection failure cb. If there are some which are still
-		not connected try to establish connection to one of them.
-		'''
+		"""
+		Check the state of all streamhosts and if all has failed, then emit
+		connection failure cb. If there are some which are still not connected
+		try to establish connection to one of them
+		"""
 		self.idlequeue.remove_timeout(receiver.fd)
 		self.idlequeue.unplug_idle(receiver.fd)
 		file_props = receiver.file_props
@@ -173,7 +181,9 @@ class SocksQueue:
 			self.process_result(-1, receiver)
 
 	def _connection_refused(self, streamhost, file_props, idx):
-		''' cb, called when we loose connection during transfer'''
+		"""
+		Called when we loose connection during transfer
+		"""
 		if file_props is None:
 			return
 		streamhost['state'] = -1
@@ -189,7 +199,9 @@ class SocksQueue:
 			del(file_props['failure_cb'])
 
 	def add_receiver(self, account, sock5_receiver):
-		''' add new file request '''
+		"""
+		Add new file request
+		"""
 		self.readers[self.idx] = sock5_receiver
 		sock5_receiver.queue_idx = self.idx
 		sock5_receiver.queue = self
@@ -259,9 +271,10 @@ class SocksQueue:
 				sender.file_props = file_props
 
 	def add_file_props(self, account, file_props):
-		''' file_prop to the dict of current file_props.
-		It is identified by account name and sid
-		'''
+		"""
+		File_prop to the dict of current file_props. It is identified by account
+		name and sid
+		"""
 		if file_props is None or ('sid' in file_props) is False:
 			return
 		_id = file_props['sid']
@@ -279,7 +292,9 @@ class SocksQueue:
 			self.connected = 0
 
 	def get_file_props(self, account, sid):
-		''' get fil_prop by account name and session id '''
+		"""
+		Get fil_prop by account name and session id
+		"""
 		if account in self.files_props:
 			fl_props = self.files_props[account]
 			if sid in fl_props:
@@ -294,11 +309,12 @@ class SocksQueue:
 			self.connected += 1
 
 	def process_result(self, result, actor):
-		''' Take appropriate actions upon the result:
-		[ 0, - 1 ] complete/end transfer
-		[ > 0 ] send progress message
-		[ None ] do nothing
-		'''
+		"""
+		Take appropriate actions upon the result:
+			[ 0, - 1 ] complete/end transfer
+			[ > 0 ] send progress message
+			[ None ] do nothing
+		"""
 		if result is None:
 			return
 		if result in (0, -1) and self.complete_transfer_cb is not None:
@@ -310,8 +326,10 @@ class SocksQueue:
 			self.progress_transfer_cb(actor.account, actor.file_props)
 
 	def remove_receiver(self, idx, do_disconnect=True):
-		''' Remove reciver from the list and decrease
-		the number of active connections with 1'''
+		"""
+		Remove reciver from the list and decrease the number of active
+		connections with 1
+		"""
 		if idx != -1:
 			if idx in self.readers:
 				reader = self.readers[idx]
@@ -325,8 +343,10 @@ class SocksQueue:
 					del(self.readers[idx])
 
 	def remove_sender(self, idx, do_disconnect=True):
-		''' Remove sender from the list of senders and decrease the
-		number of active connections with 1'''
+		"""
+		Remove sender from the list of senders and decrease the number of active
+		connections with 1
+		"""
 		if idx != -1:
 			if idx in self.senders:
 				if do_disconnect:
@@ -386,9 +406,10 @@ class Socks5:
 			self.file = None
 
 	def get_fd(self):
-		''' Test if file is already open and return its fd,
-		or just open the file and return the fd.
-		'''
+		"""
+		Test if file is already open and return its fd, or just open the file and
+		return the fd
+		"""
 		if 'fd' in self.file_props:
 			fd = self.file_props['fd']
 		else:
@@ -413,8 +434,10 @@ class Socks5:
 			pass
 
 	def receive(self):
-		''' Reads small chunks of data.
-			Calls owner's disconnected() method if appropriate.'''
+		"""
+		Read small chunks of data. Call owner's disconnected() method if
+		appropriate
+		"""
 		received = ''
 		try:
 			add = self._recv(64)
@@ -426,7 +449,9 @@ class Socks5:
 		return add
 
 	def send_raw(self,raw_data):
-		''' Writes raw outgoing data. '''
+		"""
+		Write raw outgoing data
+		"""
 		try:
 			self._send(raw_data)
 		except Exception:
@@ -483,7 +508,9 @@ class Socks5:
 			return -1
 
 	def get_file_contents(self, timeout):
-		''' read file contents from socket and write them to file '''
+		"""
+		Read file contents from socket and write them to file
+		"""
 		if self.file_props is None or ('file-name' in self.file_props) is False:
 			self.file_props['error'] = -2
 			return None
@@ -557,7 +584,9 @@ class Socks5:
 		return None
 
 	def disconnect(self):
-		''' Closes open descriptors and remover socket descr. from idleque '''
+		"""
+		Close open descriptors and remover socket descr. from idleque
+		"""
 		# be sure that we don't leave open file
 		self.close_file()
 		self.idlequeue.remove_timeout(self.fd)
@@ -573,13 +602,15 @@ class Socks5:
 		self.state = -1
 
 	def _get_auth_buff(self):
-		''' Message, that we support 1 one auth mechanism:
-		the 'no auth' mechanism. '''
+		"""
+		Message, that we support 1 one auth mechanism: the 'no auth' mechanism
+		"""
 		return struct.pack('!BBB', 0x05, 0x01, 0x00)
 
 	def _parse_auth_buff(self, buff):
-		''' Parse the initial message and create a list of auth
-		mechanisms '''
+		"""
+		Parse the initial message and create a list of auth mechanisms
+		"""
 		auth_mechanisms = []
 		try:
 			num_auth = struct.unpack('!xB', buff[:2])[0]
@@ -591,9 +622,9 @@ class Socks5:
 		return auth_mechanisms
 
 	def _get_auth_response(self):
-		''' socks version(5), number of extra auth methods (we send
-		0x00 - no auth
-		) '''
+		"""
+		Socks version(5), number of extra auth methods (we send 0x00 - no auth)
+		"""
 		return struct.pack('!BB', 0x05, 0x00)
 
 	def _get_connect_buff(self):
@@ -604,8 +635,10 @@ class Socks5:
 		return buff
 
 	def _get_request_buff(self, msg, command = 0x01):
-		''' Connect request by domain name,
-		sid sha, instead of domain name (jep 0096) '''
+		"""
+		Connect request by domain name, sid sha, instead of domain name (jep
+		0096)
+		"""
 		buff = struct.pack('!BBBBB%dsBB' % len(msg),
 			0x05, command, 0x00, 0x03, len(msg), msg, 0, 0)
 		return buff
@@ -634,7 +667,9 @@ class Socks5:
 		return (req_type, host, port)
 
 	def read_connect(self):
-		''' connect responce: version, auth method '''
+		"""
+		Connect response: version, auth method
+		"""
 		buff = self._recv()
 		try:
 			version, method = struct.unpack('!BB', buff)
@@ -652,7 +687,9 @@ class Socks5:
 			self.idlequeue.plug_idle(self, True, False)
 
 	def _get_sha1_auth(self):
-		''' get sha of sid + Initiator jid + Target jid '''
+		"""
+		Get sha of sid + Initiator jid + Target jid
+		"""
 		if 'is_a_proxy' in self.file_props:
 			del(self.file_props['is_a_proxy'])
 			return hashlib.sha1('%s%s%s' % (self.sid,
@@ -662,9 +699,12 @@ class Socks5:
 			hexdigest()
 
 class Socks5Sender(Socks5, IdleObject):
-	''' class for sending file to socket over socks5 '''
+	"""
+	Class for sending file to socket over socks5
+	"""
+
 	def __init__(self, idlequeue, sock_hash, parent, _sock, host=None,
-	port=None):
+			port=None):
 		self.queue_idx = sock_hash
 		self.queue = parent
 		Socks5.__init__(self, idlequeue, host, port, None, None, None)
@@ -745,7 +785,9 @@ class Socks5Sender(Socks5, IdleObject):
 			self.disconnect()
 
 	def send_file(self):
-		''' start sending the file over verified connection '''
+		"""
+		Start sending the file over verified connection
+		"""
 		if self.file_props['started']:
 			return
 		self.file_props['error'] = 0
@@ -766,7 +808,9 @@ class Socks5Sender(Socks5, IdleObject):
 		return self.write_next() # initial for nl byte
 
 	def main(self):
-		''' initial requests for verifying the connection '''
+		"""
+		Initial requests for verifying the connection
+		"""
 		if self.state == 1: # initial read
 			buff = self.receive()
 			if not self.connected:
@@ -785,7 +829,9 @@ class Socks5Sender(Socks5, IdleObject):
 		return None
 
 	def disconnect(self, cb=True):
-		''' Closes the socket. '''
+		"""
+		Close the socket
+		"""
 		# close connection and remove us from the queue
 		Socks5.disconnect(self)
 		if self.file_props is not None:
@@ -796,10 +842,12 @@ class Socks5Sender(Socks5, IdleObject):
 
 class Socks5Listener(IdleObject):
 	def __init__(self, idlequeue, port):
-		''' handle all incomming connections on (0.0.0.0, port)
+		"""
+		Handle all incomming connections on (0.0.0.0, port)
+
 		This class implements IdleObject, but we will expect
 		only pollin events though
-		'''
+		"""
 		self.port = port
 		self.ais = socket.getaddrinfo(None, port, socket.AF_UNSPEC,
 			socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_PASSIVE)
@@ -813,8 +861,14 @@ class Socks5Listener(IdleObject):
 
 	def bind(self):
 		for ai in self.ais:
-			#try the different possibilities (ipv6, ipv4, etc.)
-			self._serv = socket.socket(*ai[:3])
+			# try the different possibilities (ipv6, ipv4, etc.)
+			try:
+				self._serv = socket.socket(*ai[:3])
+			except socket.error, e:
+				if e.errno == EAFNOSUPPORT:
+					self.ai = None
+					continue
+				raise
 			self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 			self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
 			self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
@@ -843,16 +897,22 @@ class Socks5Listener(IdleObject):
 		self.started = True
 
 	def pollend(self):
-		''' called when we stop listening on (host, port) '''
+		"""
+		Called when we stop listening on (host, port)
+		"""
 		self.disconnect()
 
 	def pollin(self):
-		''' accept a new incomming connection and notify queue'''
+		"""
+		Accept a new incomming connection and notify queue
+		"""
 		sock = self.accept_conn()
 		self.queue.on_connection_accepted(sock)
 
 	def disconnect(self):
-		''' free all resources, we are not listening anymore '''
+		"""
+		Free all resources, we are not listening anymore
+		"""
 		self.idlequeue.remove_timeout(self.fd)
 		self.idlequeue.unplug_idle(self.fd)
 		self.fd = -1
@@ -864,7 +924,9 @@ class Socks5Listener(IdleObject):
 			pass
 
 	def accept_conn(self):
-		''' accepts a new incomming connection '''
+		"""
+		Accept a new incomming connection
+		"""
 		_sock  = self._serv.accept()
 		_sock[0].setblocking(False)
 		return _sock
@@ -909,7 +971,9 @@ class Socks5Receiver(Socks5, IdleObject):
 			self.queue.reconnect_receiver(self, self.streamhost)
 
 	def connect(self):
-		''' create the socket and plug it to the idlequeue '''
+		"""
+		Create the socket and plug it to the idlequeue
+		"""
 		if self.ais is None:
 			return None
 
@@ -1018,7 +1082,9 @@ class Socks5Receiver(Socks5, IdleObject):
 		return 1 # we are connected
 
 	def main(self, timeout=0):
-		''' begin negotiation. on success 'address' != 0 '''
+		"""
+		Begin negotiation. on success 'address' != 0
+		"""
 		result = 1
 		buff = self.receive()
 		if buff == '':
@@ -1087,7 +1153,9 @@ class Socks5Receiver(Socks5, IdleObject):
 			return None
 
 	def disconnect(self, cb=True):
-		''' Closes the socket. Remove self from queue if cb is True'''
+		"""
+		Close the socket. Remove self from queue if cb is True
+		"""
 		# close connection
 		Socks5.disconnect(self)
 		if cb is True:
diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index 3cb1a13cf..a85155efd 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -84,10 +84,11 @@ class StanzaSession(object):
 		return to
 
 	def remove_events(self, types):
-		'''
-		Remove events associated with this session from the queue.
-		returns True if any events were removed (unlike events.py remove_events)
-		'''
+		"""
+		Remove events associated with this session from the queue
+
+		Returns True if any events were removed (unlike events.py remove_events)
+		"""
 		any_removed = False
 
 		for j in (self.jid, self.jid.getStripped()):
@@ -140,10 +141,10 @@ class StanzaSession(object):
 		self.cancelled_negotiation()
 
 	def cancelled_negotiation(self):
-		'''
+		"""
 		A negotiation has been cancelled, so reset this session to its default
-		state.
-		'''
+		state
+		"""
 		if self.control:
 			self.control.on_cancel_session_negotiation()
 
@@ -175,7 +176,7 @@ class StanzaSession(object):
 
 
 class EncryptedStanzaSession(StanzaSession):
-	'''
+	"""
 	An encrypted stanza negotiation has several states. They arerepresented	as
 	the following values in the 'status' attribute of the session object:
 
@@ -198,7 +199,8 @@ class EncryptedStanzaSession(StanzaSession):
 
 	The transition between these states is handled in gajim.py's
 	handle_session_negotiation method.
-	'''
+	"""
+
 	def __init__(self, conn, jid, thread_id, type_='chat'):
 		StanzaSession.__init__(self, conn, jid, thread_id, type_='chat')
 
@@ -228,9 +230,9 @@ class EncryptedStanzaSession(StanzaSession):
 		return True
 
 	def set_kc_s(self, value):
-		'''
-		keep the encrypter updated with my latest cipher key
-		'''
+		"""
+		Keep the encrypter updated with my latest cipher key
+		"""
 		self._kc_s = value
 		self.encrypter = self.cipher.new(self._kc_s, self.cipher.MODE_CTR,
 			counter=self.encryptcounter)
@@ -239,9 +241,9 @@ class EncryptedStanzaSession(StanzaSession):
 		return self._kc_s
 
 	def set_kc_o(self, value):
-		'''
-		keep the decrypter updated with the other party's latest cipher key
-		'''
+		"""
+		Keep the decrypter updated with the other party's latest cipher key
+		"""
 		self._kc_o = value
 		self.decrypter = self.cipher.new(self._kc_o, self.cipher.MODE_CTR,
 			counter=self.decryptcounter)
@@ -335,7 +337,9 @@ class EncryptedStanzaSession(StanzaSession):
 		return self.encrypter.encrypt(padded)
 
 	def decrypt_stanza(self, stanza):
-		''' delete the unencrypted explanation body, if it exists '''
+		"""
+		Delete the unencrypted explanation body, if it exists
+		"""
 		orig_body = stanza.getTag('body')
 		if orig_body:
 			stanza.delChild(orig_body)
@@ -584,7 +588,9 @@ class EncryptedStanzaSession(StanzaSession):
 		self.send(request)
 
 	def verify_options_bob(self, form):
-		''' 4.3 esession response (bob) '''
+		"""
+		4.3 esession response (bob)
+		"""
 		negotiated = {'recv_pubkey': None, 'send_pubkey': None}
 		not_acceptable = []
 		ask_user = {}
@@ -653,7 +659,9 @@ class EncryptedStanzaSession(StanzaSession):
 		return (negotiated, not_acceptable, ask_user)
 
 	def respond_e2e_bob(self, form, negotiated, not_acceptable):
-		''' 4.3 esession response (bob) '''
+		"""
+		4.3 esession response (bob)
+		"""
 		response = xmpp.Message()
 		feature = response.NT.feature
 		feature.setNamespace(xmpp.NS_FEATURE)
@@ -728,7 +736,9 @@ class EncryptedStanzaSession(StanzaSession):
 		self.send(response)
 
 	def verify_options_alice(self, form):
-		''' 'Alice Accepts' '''
+		"""
+		'Alice Accepts'
+		"""
 		negotiated = {}
 		ask_user = {}
 		not_acceptable = []
@@ -756,11 +766,13 @@ class EncryptedStanzaSession(StanzaSession):
 		return (negotiated, not_acceptable, ask_user)
 
 	def accept_e2e_alice(self, form, negotiated):
-		''' 'Alice Accepts', continued '''
+		"""
+		'Alice Accepts', continued
+		"""
 		self.encryptable_stanzas = ['message']
 		self.sas_algs = 'sas28x5'
 		self.cipher = AES
-		self.hash_alg = sha256 
+		self.hash_alg = sha256
 		self.compression = None
 
 		self.negotiated = negotiated
@@ -828,7 +840,9 @@ class EncryptedStanzaSession(StanzaSession):
 			self.status = 'identified-alice'
 
 	def accept_e2e_bob(self, form):
-		''' 4.5 esession accept (bob) '''
+		"""
+		4.5 esession accept (bob)
+		"""
 		response = xmpp.Message()
 
 		init = response.NT.init
@@ -948,11 +962,11 @@ class EncryptedStanzaSession(StanzaSession):
 			self.control.print_esession_details()
 
 	def do_retained_secret(self, k, old_srs):
-		'''
+		"""
 		Calculate the new retained secret. determine if the user needs to check
 		the remote party's identity. Set up callbacks for when the identity has
-		been verified.
-		'''
+		been verified
+		"""
 		new_srs = self.hmac(k, 'New Retained Secret')
 		self.srs = new_srs
 
@@ -1017,12 +1031,12 @@ class EncryptedStanzaSession(StanzaSession):
 		self.enable_encryption = False
 
 	def fail_bad_negotiation(self, reason, fields=None):
-		'''
-		Sends an error and cancels everything.
+		"""
+		Send an error and cancels everything
 
 		If fields is None, the remote party has given us a bad cryptographic
-		value of some kind. Otherwise, list the fields we haven't implemented
-		'''
+		value of some kind. Otherwise, list the fields we haven't implemented.
+		"""
 		err = xmpp.Error(xmpp.Message(), xmpp.ERR_FEATURE_NOT_IMPLEMENTED)
 		err.T.error.T.text.setData(reason)
 
diff --git a/src/common/xmpp/auth_nb.py b/src/common/xmpp/auth_nb.py
index e5e51f6b8..9872f651b 100644
--- a/src/common/xmpp/auth_nb.py
+++ b/src/common/xmpp/auth_nb.py
@@ -13,12 +13,14 @@
 ##   but WITHOUT ANY WARRANTY; without even the implied warranty of
 ##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ##   GNU General Public License for more details.
-'''
+
+"""
 Provides plugs for SASL and NON-SASL authentication mechanisms.
-Can be used both for client and transport authentication.
+Can be used both for client and transport authentication
 
 See client_nb.py
-'''
+"""
+
 from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH
 from protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID
 from plugin import PlugIn
@@ -49,7 +51,8 @@ SASL_UNSUPPORTED = 'not-supported'
 SASL_IN_PROCESS = 'in-process'
 
 def challenge_splitter(data):
-	''' Helper function that creates a dict from challenge string.
+	"""
+	Helper function that creates a dict from challenge string
 
 	Sample challenge string:
 		username="example.org",realm="somerealm",\
@@ -59,7 +62,7 @@ def challenge_splitter(data):
 	Expected result for challan:
 		dict['qop'] = ('auth','auth-int','auth-conf')
 		dict['realm'] = 'somerealm'
-	'''
+	"""
 	X_KEYWORD, X_VALUE, X_END = 0, 1, 2
 	quotes_open = False
 	keyword, value = '', ''
@@ -112,16 +115,17 @@ def challenge_splitter(data):
 
 
 class SASL(PlugIn):
-	'''
+	"""
 	Implements SASL authentication. Can be plugged into NonBlockingClient
-	to start authentication.
-	'''
+	to start authentication
+	"""
+
 	def __init__(self, username, password, on_sasl):
-		'''
+		"""
 		:param user: XMPP username
 		:param password: XMPP password
 		:param on_sasl: Callback, will be called after each SASL auth-step.
-		'''
+		"""
 		PlugIn.__init__(self)
 		self.username = username
 		self.password = password
@@ -141,7 +145,9 @@ class SASL(PlugIn):
 			self.startsasl = None
 
 	def plugout(self):
-		''' Remove SASL handlers from owner's dispatcher. Used internally. '''
+		"""
+		Remove SASL handlers from owner's dispatcher. Used internally
+		"""
 		if 'features' in  self._owner.__dict__:
 			self._owner.UnregisterHandler('features', self.FeaturesHandler,
 				xmlns=NS_STREAMS)
@@ -156,13 +162,13 @@ class SASL(PlugIn):
 				xmlns=NS_SASL)
 
 	def auth(self):
-		'''
+		"""
 		Start authentication. Result can be obtained via "SASL.startsasl"
-		attribute and will be either SASL_SUCCESS or SASL_FAILURE.
+		attribute and will be either SASL_SUCCESS or SASL_FAILURE
 
 		Note that successfull auth will take at least two Dispatcher.Process()
 		calls.
-		'''
+		"""
 		if self.startsasl:
 			pass
 		elif self._owner.Dispatcher.Stream.features:
@@ -176,7 +182,9 @@ class SASL(PlugIn):
 				self.FeaturesHandler, xmlns=NS_STREAMS)
 
 	def FeaturesHandler(self, conn, feats):
-		''' Used to determine if server supports SASL auth. Used internally. '''
+		"""
+		Used to determine if server supports SASL auth. Used internally
+		"""
 		if not feats.getTag('mechanisms', namespace=NS_SASL):
 			self.startsasl='not-supported'
 			log.error('SASL not supported by server')
@@ -199,6 +207,14 @@ class SASL(PlugIn):
 			self.startsasl = SASL_IN_PROCESS
 			self._owner.send(str(node))
 			raise NodeProcessed
+		if "EXTERNAL" in self.mecs:
+			self.mecs.remove('EXTERNAL')
+			node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'EXTERNAL'},
+				payload=[base64.encodestring('%s@%s' % (self.username,
+				self._owner.Server)).replace('\n', '')])
+			self.startsasl = SASL_IN_PROCESS
+			self._owner.send(str(node))
+			raise NodeProcessed
 		if 'GSSAPI' in self.mecs and have_kerberos:
 			self.mecs.remove('GSSAPI')
 			try:
@@ -229,13 +245,16 @@ class SASL(PlugIn):
 			self.startsasl = SASL_IN_PROCESS
 			raise NodeProcessed
 		self.startsasl = SASL_FAILURE
-		log.error('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.')
+		log.error('I can only use EXTERNAL, DIGEST-MD5, GSSAPI and PLAIN '
+			'mecanisms.')
 		if self.on_sasl:
 			self.on_sasl()
 		return
 
 	def SASLHandler(self, conn, challenge):
-		''' Perform next SASL auth step. Used internally. '''
+		"""
+		Perform next SASL auth step. Used internally
+		"""
 		if challenge.getNamespace() != NS_SASL:
 			return
 		### Handle Auth result
@@ -332,8 +351,17 @@ class SASL(PlugIn):
 		else:
 			self.password = password
 		if self.mechanism == 'DIGEST-MD5':
-			A1 = C([H(C([self.resp['username'], self.resp['realm'],
-				self.password])), self.resp['nonce'], self.resp['cnonce']])
+			def convert_to_iso88591(string):
+				try:
+					string = string.decode('utf-8').encode('iso-8859-1')
+				except UnicodeEncodeError:
+					pass
+				return string
+			hash_username = convert_to_iso88591(self.resp['username'])
+			hash_realm = convert_to_iso88591(self.resp['realm'])
+			hash_password = convert_to_iso88591(self.password)
+			A1 = C([H(C([hash_username, hash_realm, hash_password])),
+				self.resp['nonce'], self.resp['cnonce']])
 			A2 = C(['AUTHENTICATE', self.resp['digest-uri']])
 			response= HH(C([HH(A1), self.resp['nonce'], self.resp['nc'],
 				self.resp['cnonce'], self.resp['qop'], HH(A2)]))
@@ -359,12 +387,15 @@ class SASL(PlugIn):
 
 
 class NonBlockingNonSASL(PlugIn):
-	'''
+	"""
 	Implements old Non-SASL (JEP-0078) authentication used in jabberd1.4 and
-	transport authentication.
-	'''
+	transport authentication
+	"""
+
 	def __init__(self, user, password, resource, on_auth):
-		''' Caches username, password and resource for auth. '''
+		"""
+		Caches username, password and resource for auth
+		"""
 		PlugIn.__init__(self)
 		self.user = user
 		if password is None:
@@ -375,10 +406,10 @@ class NonBlockingNonSASL(PlugIn):
 		self.on_auth = on_auth
 
 	def plugin(self, owner):
-		'''
+		"""
 		Determine the best auth method (digest/0k/plain) and use it for auth.
-		Returns used method name on success. Used internally.
-		'''
+		Returns used method name on success. Used internally
+		"""
 		log.info('Querying server about possible auth methods')
 		self.owner = owner
 
@@ -438,10 +469,11 @@ class NonBlockingNonSASL(PlugIn):
 
 
 class NonBlockingBind(PlugIn):
-	'''
+	"""
 	Bind some JID to the current connection to allow router know of our
-	location. Must be plugged after successful SASL auth.
-	'''
+	location. Must be plugged after successful SASL auth
+	"""
+
 	def __init__(self):
 		PlugIn.__init__(self)
 		self.bound = None
@@ -459,10 +491,10 @@ class NonBlockingBind(PlugIn):
 				xmlns=NS_STREAMS)
 
 	def FeaturesHandler(self, conn, feats):
-		'''
+		"""
 		Determine if server supports resource binding and set some internal
-		attributes accordingly.
-		'''
+		attributes accordingly
+		"""
 		if not feats.getTag('bind', namespace=NS_BIND):
 			log.error('Server does not requested binding.')
 			# we try to bind resource anyway
@@ -476,14 +508,16 @@ class NonBlockingBind(PlugIn):
 		self.bound = []
 
 	def plugout(self):
-		''' Remove Bind handler from owner's dispatcher. Used internally. '''
+		"""
+		Remove Bind handler from owner's dispatcher. Used internally
+		"""
 		self._owner.UnregisterHandler('features', self.FeaturesHandler,
 			xmlns=NS_STREAMS)
 
 	def NonBlockingBind(self, resource=None, on_bound=None):
-		''' Perform binding.
-		Use provided resource name or random (if not provided).
-		'''
+		"""
+		Perform binding. Use provided resource name or random (if not provided).
+		"""
 		self.on_bound = on_bound
 		self._resource = resource
 		if self._resource:
diff --git a/src/common/xmpp/bosh.py b/src/common/xmpp/bosh.py
index bb6ea4dd8..2658668ba 100644
--- a/src/common/xmpp/bosh.py
+++ b/src/common/xmpp/bosh.py
@@ -125,11 +125,12 @@ class NonBlockingBOSH(NonBlockingTransport):
 			log.warn('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.get_state(), self.fd))
 
 	def on_http_request_possible(self):
-		'''
+		"""
 		Called when HTTP request it's possible to send a HTTP request. It can be when
-		socket is connected or when HTTP response arrived.
+		socket is connected or when HTTP response arrived
+
 		There should be always one pending request to BOSH CM.
-		'''
+		"""
 		log.debug('on_http_req possible, state:\n%s' % self.get_current_state())
 		if self.get_state()==DISCONNECTED: return
 
@@ -149,14 +150,18 @@ class NonBlockingBOSH(NonBlockingTransport):
 
 
 	def get_socket_in(self, state):
-		''' gets sockets in desired state '''
+		"""
+		Get sockets in desired state
+		"""
 		for s in self.http_socks:
 			if s.get_state()==state: return s
 		return None
 
 
 	def get_free_socket(self):
-		''' Selects and returns socket eligible for sending a data to.'''
+		"""
+		Select and returns socket eligible for sending a data to
+		"""
 		if self.http_pipelining:
 			return self.get_socket_in(CONNECTED)
 		else:
@@ -176,10 +181,10 @@ class NonBlockingBOSH(NonBlockingTransport):
 
 
 	def send_BOSH(self, payload):
-		'''
+		"""
 		Tries to send a stanza in payload by appeding it to a buffer and plugging a
 		free socket for writing.
-		'''
+		"""
 		total_pending_reqs = sum([s.pending_requests for s in self.http_socks])
 
 		# when called after HTTP response (Payload=None) and when there are already
@@ -236,15 +241,16 @@ class NonBlockingBOSH(NonBlockingTransport):
 			log.error('=====!!!!!!!!====> Couldn\'t get free socket in plug_socket())')
 
 	def build_stanza(self, socket):
-		'''
-		Builds a BOSH body tag from data in buffers and adds key, rid and ack
-		attributes to it.
+		"""
+		Build a BOSH body tag from data in buffers and adds key, rid and ack
+		attributes to it
+
 		This method is called from _do_send() of underlying transport. This is to
-		ensure rid and keys will be processed in correct order. If I generate them
-		before	plugging a socket for write (and did it for two sockets/HTTP
-		connections) in parallel, they might be sent in wrong order, which results
-		in violating the BOSH session and server-side disconnect.
-		'''
+		ensure rid and keys will be processed in correct order. If I generate
+		them before	plugging a socket for write (and did it for two sockets/HTTP
+		connections) in parallel, they might be sent in wrong order, which
+		results in violating the BOSH session and server-side disconnect.
+		"""
 		if self.prio_bosh_stanzas:
 			stanza, add_payload = self.prio_bosh_stanzas.pop(0)
 			if add_payload:
@@ -285,10 +291,11 @@ class NonBlockingBOSH(NonBlockingTransport):
 				self.wait_cb_time)
 
 	def on_persistent_fallback(self, socket):
-		'''
-		Called from underlying transport when server closes TCP connection.
+		"""
+		Called from underlying transport when server closes TCP connection
+
 		:param socket: disconnected transport object
-		'''
+		"""
 		if socket.http_persistent:
 			log.warn('Fallback to nonpersistent HTTP (no pipelining as well)')
 			socket.http_persistent = False
@@ -302,9 +309,10 @@ class NonBlockingBOSH(NonBlockingTransport):
 
 
 	def handle_body_attrs(self, stanza_attrs):
-		'''
-		Called for each incoming body stanza from dispatcher. Checks body attributes.
-		'''
+		"""
+		Called for each incoming body stanza from dispatcher. Checks body
+		attributes.
+		"""
 		self.remove_bosh_wait_timeout()
 
 		if self.after_init:
@@ -345,7 +353,9 @@ class NonBlockingBOSH(NonBlockingTransport):
 
 
 	def append_stanza(self, stanza):
-		''' appends stanza to a buffer to send '''
+		"""
+		Append stanza to a buffer to send
+		"""
 		if stanza:
 			if isinstance(stanza, tuple):
 				# stanza is tuple of BOSH stanza and bool value for whether to add payload
@@ -378,7 +388,9 @@ class NonBlockingBOSH(NonBlockingTransport):
 
 
 	def boshify_stanzas(self, stanzas=[], body_attrs=None):
-		''' wraps zero to many stanzas by body tag with xmlns and sid '''
+		"""
+		Wraps zero to many stanzas by body tag with xmlns and sid
+		"""
 		log.debug('boshify_staza - type is: %s, stanza is %s' % (type(stanzas), stanzas))
 		tag = BOSHBody(attrs={'sid': self.bosh_sid})
 		tag.setPayload(stanzas)
@@ -470,10 +482,10 @@ def get_rand_number():
 
 
 class AckChecker():
-	'''
+	"""
 	Class for generating rids and generating and checking acknowledgements in
-	BOSH messages.
-	'''
+	BOSH messages
+	"""
 	def __init__(self):
 		self.rid = get_rand_number()
 		self.ack = 1
@@ -516,9 +528,9 @@ class AckChecker():
 
 
 class KeyStack():
-	'''
+	"""
 	Class implementing key sequences for BOSH messages
-	'''
+	"""
 	def __init__(self, count):
 		self.count = count
 		self.keys = []
diff --git a/src/common/xmpp/c14n.py b/src/common/xmpp/c14n.py
index bccce8155..521f3144b 100644
--- a/src/common/xmpp/c14n.py
+++ b/src/common/xmpp/c14n.py
@@ -18,7 +18,10 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-''' XML canonicalisation methods (for XEP-0116) '''
+"""
+XML canonicalisation methods (for XEP-0116)
+"""
+
 from simplexml import ustr
 
 def c14n(node, is_buggy):
diff --git a/src/common/xmpp/client_nb.py b/src/common/xmpp/client_nb.py
index 489885f76..b2b1d3b35 100644
--- a/src/common/xmpp/client_nb.py
+++ b/src/common/xmpp/client_nb.py
@@ -16,9 +16,10 @@
 
 # $Id: client.py,v 1.52 2006/01/02 19:40:55 normanr Exp $
 
-'''
+"""
 Client class establishs connection to XMPP Server and handles authentication
-'''
+"""
+
 import socket
 import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh
 from protocol import NS_TLS
@@ -28,21 +29,22 @@ log = logging.getLogger('gajim.c.x.client_nb')
 
 
 class NonBlockingClient:
-	'''
+	"""
 	Client class is XMPP connection mountpoint. Objects for authentication,
 	network communication, roster, xml parsing ... are plugged to client object.
 	Client implements the abstract behavior - mostly negotioation and callbacks
-	handling, whereas underlying modules take care of feature-specific logic.
-	'''
+	handling, whereas underlying modules take care of feature-specific logic
+	"""
+
 	def __init__(self, domain, idlequeue, caller=None):
-		'''
-		Caches connection data:
+		"""
+		Caches connection data
 
 		:param domain: domain - for to: attribute (from account info)
 		:param idlequeue: processing idlequeue
 		:param caller: calling object - it has to implement methods
 			_event_dispatcher which is called from dispatcher instance
-		'''
+		"""
 		self.Namespace = protocol.NS_CLIENT
 		self.defaultNamespace = self.Namespace
 
@@ -69,10 +71,10 @@ class NonBlockingClient:
 		self.protocol_type = 'XMPP'
 
 	def disconnect(self, message=''):
-		'''
-		Called on disconnection - disconnect callback is picked based on state
-		of the client.
-		'''
+		"""
+		Called on disconnection - disconnect callback is picked based on state of
+		the client.
+		"""
 		# to avoid recursive calls
 		if self.disconnecting: return
 
@@ -112,7 +114,7 @@ class NonBlockingClient:
 				log.debug('calling on_proxy_failure cb')
 				self.on_proxy_failure(reason=message)
 			else:
-				log.debug('ccalling on_connect_failure cb')
+				log.debug('calling on_connect_failure cb')
 				self.on_connect_failure()
 		else:
 			# we are connected to XMPP server
@@ -132,9 +134,10 @@ class NonBlockingClient:
 		self.disconnecting = False
 
 	def connect(self, on_connect, on_connect_failure, hostname=None, port=5222,
-	on_proxy_failure=None, proxy=None, secure_tuple=('plain', None, None)):
-		'''
-		Open XMPP connection (open XML streams in both directions).
+			on_proxy_failure=None, proxy=None, secure_tuple=('plain', None,
+				None)):
+		"""
+		Open XMPP connection (open XML streams in both directions)
 
 		:param on_connect: called after stream is successfully opened
 		:param on_connect_failure: called when error occures during connection
@@ -150,7 +153,7 @@ class NonBlockingClient:
 			'tls' - TLS established after negotiation with starttls, or 'plain'.
 			cacerts, mycerts - see tls_nb.NonBlockingTLS constructor for more
 			details
-		'''
+		"""
 		self.on_connect = on_connect
 		self.on_connect_failure=on_connect_failure
 		self.on_proxy_failure = on_proxy_failure
@@ -223,7 +226,11 @@ class NonBlockingClient:
 			on_success=self._try_next_ip)
 
 	def _resolve_hostname(self, hostname, port, on_success):
-		''' wrapper for getaddinfo call. FIXME: getaddinfo blocks'''
+		"""
+		Wrapper for getaddinfo call
+
+		FIXME: getaddinfo blocks
+		"""
 		try:
 			self.ip_addresses = socket.getaddrinfo(hostname, port,
 				socket.AF_UNSPEC, socket.SOCK_STREAM)
@@ -234,7 +241,9 @@ class NonBlockingClient:
 			on_success()
 
 	def _try_next_ip(self, err_message=None):
-		'''Iterates over IP addresses tries to connect to it'''
+		"""
+		Iterate over IP addresses tries to connect to it
+		"""
 		if err_message:
 			log.debug('While looping over DNS A records: %s' % err_message)
 		if self.ip_addresses == []:
@@ -249,18 +258,20 @@ class NonBlockingClient:
 				on_connect_failure=self._try_next_ip)
 
 	def incoming_stream_version(self):
-		''' gets version of xml stream'''
+		"""
+		Get version of xml stream
+		"""
 		if 'version' in self.Dispatcher.Stream._document_attrs:
 			return self.Dispatcher.Stream._document_attrs['version']
 		else:
 			return None
 
 	def _xmpp_connect(self, socket_type=None):
-		'''
-		Starts XMPP connecting process - opens the XML stream. Is called after TCP
+		"""
+		Start XMPP connecting process - open the XML stream. Is called after TCP
 		connection is established or after switch to TLS when successfully
 		negotiated with <starttls>.
-		'''
+		"""
 		# socket_type contains info which transport connection was established
 		if not socket_type:
 			if self.Connection.ssl_lib:
@@ -273,19 +284,19 @@ class NonBlockingClient:
 		self._xmpp_connect_machine()
 
 	def _xmpp_connect_machine(self, mode=None, data=None):
-		'''
-		Finite automaton taking care of stream opening and features tag
-		handling. Calls _on_stream_start when stream is started, and disconnect()
-		on failure.
-		'''
+		"""
+		Finite automaton taking care of stream opening and features tag handling.
+		Calls _on_stream_start when stream is started, and disconnect() on
+		failure.
+		"""
 		log.info('-------------xmpp_connect_machine() >> mode: %s, data: %s...' %
 			(mode, str(data)[:20]))
 
 		def on_next_receive(mode):
-			'''
-			Sets desired on_receive callback on transport based on the state of
+			"""
+			Set desired on_receive callback on transport based on the state of
 			connect_machine.
-			'''
+			"""
 			log.info('setting %s on next receive' % mode)
 			if mode is None:
 				self.onreceive(None) # switch to Dispatcher.ProcessNonBlocking
@@ -346,10 +357,10 @@ class NonBlockingClient:
 			self._on_stream_start()
 
 	def _on_stream_start(self):
-		'''
+		"""
 		Called after XMPP stream is opened.	TLS negotiation may follow if
 		supported and desired.
-		'''
+		"""
 		self.stream_started = True
 		self.onreceive(None)
 
@@ -381,7 +392,9 @@ class NonBlockingClient:
 			assert False, 'Stream opened for unsupported connection'
 
 	def _tls_negotiation_handler(self, con=None, tag=None):
-		''' takes care of TLS negotioation with <starttls> '''
+		"""
+		Take care of TLS negotioation with <starttls>
+		"""
 		log.info('-------------tls_negotiaton_handler() >> tag: %s' % tag)
 		if not con and not tag:
 			# starting state when we send the <starttls>
@@ -407,15 +420,17 @@ class NonBlockingClient:
 				on_fail = lambda: self.disconnect('error while etabilishing TLS'))
 
 	def _on_connect(self):
-		''' preceeds call of on_connect callback '''
+		"""
+		Preceed call of on_connect callback
+		"""
 		self.onreceive(None)
 		self.on_connect(self, self.connected)
 
 	def raise_event(self, event_type, data):
-		'''
-		Raises event to connection instance. DATA_SENT and DATA_RECIVED events
+		"""
+		Raise event to connection instance. DATA_SENT and DATA_RECIVED events
 		are used in XML console to show XMPP traffic
-		'''
+		"""
 		log.info('raising event from transport: :::::%s::::\n_____________\n%s\n_____________\n' % (event_type,data))
 		if hasattr(self, 'Dispatcher'):
 			self.Dispatcher.Event('', event_type, data)
@@ -425,9 +440,9 @@ class NonBlockingClient:
 ###############################################################################
 
 	def auth(self, user, password, resource='', sasl=True, on_auth=None):
-		'''
+		"""
 		Authenticate connnection and bind resource. If resource is not provided
-		random one or library name used.
+		random one or library name used
 
 		:param user: XMPP username
 		:param password: XMPP password
@@ -435,7 +450,7 @@ class NonBlockingClient:
 		:param sasl: Boolean indicating if SASL shall be used. (default: True)
 		:param on_auth: Callback, called after auth. On auth failure, argument
 			is None.
-		'''
+		"""
 		self._User, self._Password = user, password
 		self._Resource, self._sasl = resource, sasl
 		self.on_auth = on_auth
@@ -443,7 +458,9 @@ class NonBlockingClient:
 		return
 
 	def _on_old_auth(self, res):
-		''' Callback used by NON-SASL auth. On auth failure, res is None. '''
+		"""
+		Callback used by NON-SASL auth. On auth failure, res is None
+		"""
 		if res:
 			self.connected += '+old_auth'
 			self.on_auth(self, 'old_auth')
@@ -451,7 +468,9 @@ class NonBlockingClient:
 			self.on_auth(self, None)
 
 	def _on_sasl_auth(self, res):
-		''' Used internally. On auth failure, res is None. '''
+		"""
+		Used internally. On auth failure, res is None
+		"""
 		self.onreceive(None)
 		if res:
 			self.connected += '+sasl'
@@ -460,7 +479,9 @@ class NonBlockingClient:
 			self.on_auth(self, None)
 
 	def _on_doc_attrs(self):
-		''' Plug authentication objects and start auth. '''
+		"""
+		Plug authentication objects and start auth
+		"""
 		if self._sasl:
 			auth_nb.SASL.get_instance(self._User, self._Password,
 				self._on_start_sasl).PlugIn(self)
@@ -474,7 +495,9 @@ class NonBlockingClient:
 		return True
 
 	def _on_start_sasl(self, data=None):
-		''' Callback used by SASL, called on each auth step.'''
+		"""
+		Callback used by SASL, called on each auth step
+		"""
 		if data:
 			self.Dispatcher.ProcessNonBlocking(data)
 		if not 'SASL' in self.__dict__:
@@ -504,20 +527,26 @@ class NonBlockingClient:
 		return True
 
 	def initRoster(self, version=''):
-		''' Plug in the roster. '''
+		"""
+		Plug in the roster
+		"""
 		if not self.__dict__.has_key('NonBlockingRoster'):
 			return roster_nb.NonBlockingRoster.get_instance(version=version).PlugIn(self)
 
 	def getRoster(self, on_ready=None, force=False):
-		''' Return the Roster instance, previously plugging it in and
-			requesting roster from server if needed. '''
+		"""
+		Return the Roster instance, previously plugging it in and requesting
+		roster from server if needed
+		"""
 		if self.__dict__.has_key('NonBlockingRoster'):
 			return self.NonBlockingRoster.getRoster(on_ready, force)
 		return None
 
 	def sendPresence(self, jid=None, typ=None, requestRoster=0):
-		''' Send some specific presence state.
-			Can also request roster from server if according agrument is set.'''
+		"""
+		Send some specific presence state. Can also request roster from server if
+		according agrument is set
+		"""
 		if requestRoster:
 			# FIXME: used somewhere?
 			roster_nb.NonBlockingRoster.get_instance().PlugIn(self)
@@ -528,31 +557,38 @@ class NonBlockingClient:
 ###############################################################################
 
 	def RegisterDisconnectHandler(self,handler):
-		''' Register handler that will be called on disconnect.'''
+		"""
+		Register handler that will be called on disconnect
+		"""
 		self.disconnect_handlers.append(handler)
 
 	def UnregisterDisconnectHandler(self,handler):
-		''' Unregister handler that is called on disconnect.'''
+		"""
+		Unregister handler that is called on disconnect
+		"""
 		self.disconnect_handlers.remove(handler)
 
 	def DisconnectHandler(self):
-		'''
+		"""
 		Default disconnect handler. Just raises an IOError. If you choosed to use
 		this class in your production client, override this method or at least
 		unregister it.
-		'''
+		"""
 		raise IOError('Disconnected from server.')
 
 	def get_connect_type(self):
-		''' Returns connection state. F.e.: None / 'tls' / 'plain+non_sasl'. '''
+		"""
+		Return connection state. F.e.: None / 'tls' / 'plain+non_sasl'
+		"""
 		return self.connected
 
 	def get_peerhost(self):
-		'''
+		"""
 		Gets the ip address of the account, from which is made connection to the
-		server (e.g. IP and port of gajim's socket).
+		server (e.g. IP and port of gajim's socket)
+
 		We will create listening socket on the same ip
-		'''
+		"""
 		# FIXME: tuple (ip, port) is expected (and checked for) but port num is
 		# useless
 		return self.socket.peerhost
diff --git a/src/common/xmpp/dispatcher_nb.py b/src/common/xmpp/dispatcher_nb.py
index 8f4746f68..469c47f4a 100644
--- a/src/common/xmpp/dispatcher_nb.py
+++ b/src/common/xmpp/dispatcher_nb.py
@@ -15,10 +15,10 @@
 ##   GNU General Public License for more details.
 
 
-'''
+"""
 Main xmpp decision making logic. Provides library with methods to assign
-different handlers to different XMPP stanzas and namespaces.
-'''
+different handlers to different XMPP stanzas and namespaces
+"""
 
 import simplexml, sys, locale
 from xml.parsers.expat import ExpatError
@@ -36,7 +36,7 @@ XML_DECLARATION = '<?xml version=\'1.0\'?>'
 
 # FIXME: ugly
 class Dispatcher():
-	'''
+	"""
 	Why is this here - I needed to redefine Dispatcher for BOSH and easiest way
 	was to inherit original Dispatcher (now renamed to XMPPDispatcher). Trouble
 	is that reference used to access dispatcher instance is in Client attribute
@@ -46,7 +46,8 @@ class Dispatcher():
 
 	If having two kinds of dispatcher will go well, I will rewrite the dispatcher
 	references in other scripts
-	'''
+	"""
+
 	def PlugIn(self, client_obj, after_SASL=False, old_features=None):
 		if client_obj.protocol_type == 'XMPP':
 			XMPPDispatcher().PlugIn(client_obj)
@@ -57,22 +58,23 @@ class Dispatcher():
 
 	@classmethod
 	def get_instance(cls, *args, **kwargs):
-		'''
-		Factory Method for object creation.
+		"""
+		Factory Method for object creation
 
 		Use this instead of directly initializing the class in order to make
 		unit testing much easier.
-		'''
+		"""
 		return cls(*args, **kwargs)
 
 
 class XMPPDispatcher(PlugIn):
-	'''
-	Handles XMPP stream and is the first who takes control over a fresh stanza.
+	"""
+	Handles XMPP stream and is the first who takes control over a fresh stanza
 
 	Is plugged into NonBlockingClient but can be replugged to restart handled
 	stream headers (used by SASL f.e.).
-	'''
+	"""
+
 	def __init__(self):
 		PlugIn.__init__(self)
 		self.handlers = {}
@@ -94,25 +96,24 @@ class XMPPDispatcher(PlugIn):
 		return repr(outgoingID)
 
 	def dumpHandlers(self):
-		'''
-			Return set of user-registered callbacks in it's internal format.
-			Used within the library to carry user handlers set over Dispatcher
-			replugins.
-		'''
+		"""
+		Return set of user-registered callbacks in it's internal format. Used
+		within the library to carry user handlers set over Dispatcher replugins
+		"""
 		return self.handlers
 
 	def restoreHandlers(self, handlers):
-		'''
-			Restores user-registered callbacks structure from dump previously
-			obtained via dumpHandlers. Used within the library to carry user
-			handlers set over Dispatcher replugins.
-		'''
+		"""
+		Restore user-registered callbacks structure from dump previously obtained
+		via dumpHandlers. Used within the library to carry user handlers set over
+		Dispatcher replugins.
+		"""
 		self.handlers = handlers
 
 	def _init(self):
-		'''
-			Registers default namespaces/protocols/handlers. Used internally.
-		'''
+		"""
+		Register default namespaces/protocols/handlers. Used internally
+		"""
 		# FIXME: inject dependencies, do not rely that they are defined by our
 		# owner
 		self.RegisterNamespace('unknown')
@@ -126,10 +127,10 @@ class XMPPDispatcher(PlugIn):
 		self.on_responses = {}
 
 	def plugin(self, owner):
-		'''
-			Plug the Dispatcher instance into Client class instance and send
-			initial stream header. Used internally.
-		'''
+		"""
+		Plug the Dispatcher instance into Client class instance and send initial
+		stream header. Used internally
+		"""
 		self._init()
 		self._owner.lastErrNode = None
 		self._owner.lastErr = None
@@ -140,7 +141,9 @@ class XMPPDispatcher(PlugIn):
 			self.StreamInit()
 
 	def plugout(self):
-		''' Prepares instance to be destructed. '''
+		"""
+		Prepare instance to be destructed
+		"""
 		self.Stream.dispatch = None
 		self.Stream.features = None
 		self.Stream.destroy()
@@ -148,7 +151,9 @@ class XMPPDispatcher(PlugIn):
 		self.Stream = None
 
 	def StreamInit(self):
-		''' Send an initial stream header. '''
+		"""
+		Send an initial stream header
+		"""
 		self.Stream = simplexml.NodeBuilder()
 		self.Stream.dispatch = self.dispatch
 		self.Stream._dispatch_depth = 2
@@ -170,15 +175,15 @@ class XMPPDispatcher(PlugIn):
 				% (tag, ns))
 
 	def ProcessNonBlocking(self, data):
-		'''
-		Check incoming stream for data waiting.
+		"""
+		Check incoming stream for data waiting
 
 		:param data: data received from transports/IO sockets
 		:return:
 			1) length of processed data if some data were processed;
 			2) '0' string if no data were processed but link is alive;
 			3) 0 (zero) if underlying connection is closed.
-		'''
+		"""
 		# FIXME:
 		# When an error occurs we disconnect the transport directly. Client's
 		# disconnect method will never be called.
@@ -211,61 +216,60 @@ class XMPPDispatcher(PlugIn):
 		return len(data)
 
 	def RegisterNamespace(self, xmlns, order='info'):
-		'''
-		Creates internal structures for newly registered namespace.
+		"""
+		Create internal structures for newly registered namespace
+
 		You can register handlers for this namespace afterwards. By default
 		one namespace is already registered
 		(jabber:client or jabber:component:accept depending on context.
-		'''
+		"""
 		log.debug('Registering namespace "%s"' % xmlns)
 		self.handlers[xmlns] = {}
 		self.RegisterProtocol('unknown', Protocol, xmlns=xmlns)
 		self.RegisterProtocol('default', Protocol, xmlns=xmlns)
 
 	def RegisterProtocol(self, tag_name, Proto, xmlns=None, order='info'):
-		'''
-		Used to declare some top-level stanza name to dispatcher.
-		Needed to start registering handlers for such stanzas.
+		"""
+		Used to declare some top-level stanza name to dispatcher
 
-		Iq, message and presence protocols are registered by default.
-		'''
+		Needed to start registering handlers for such stanzas. Iq, message and
+		presence protocols are registered by default.
+		"""
 		if not xmlns:
 			xmlns=self._owner.defaultNamespace
 		log.debug('Registering protocol "%s" as %s(%s)' %(tag_name, Proto, xmlns))
 		self.handlers[xmlns][tag_name] = {type:Proto, 'default':[]}
 
 	def RegisterNamespaceHandler(self, xmlns, handler, typ='', ns='',
-	makefirst=0, system=0):
-		'''
-		Register handler for processing all stanzas for specified namespace.
-		'''
+			makefirst=0, system=0):
+		"""
+		Register handler for processing all stanzas for specified namespace
+		"""
 		self.RegisterHandler('default', handler, typ, ns, xmlns, makefirst,
 			system)
 
 	def RegisterHandler(self, name, handler, typ='', ns='', xmlns=None,
 			makefirst=False, system=False):
-		'''
-		Register user callback as stanzas handler of declared type.
+		"""
+		Register user callback as stanzas handler of declared type
 
-		Callback must take (if chained, see later) arguments:
+		Callback arguments:
 		dispatcher instance (for replying), incoming return of previous handlers.
 		The callback must raise xmpp.NodeProcessed just before return if it wants
-		other callbacks to be called with the same stanza as argument _and_, more
-		importantly	library from returning stanza to sender with error set.
+		to prevent other callbacks to be called with the same stanza as argument
+		_and_, more	importantly	library from returning stanza to sender with error set.
 
 		:param name: name of stanza. F.e. "iq".
 		:param handler: user callback.
 		:param typ: value of stanza's "type" attribute. If not specified any
 			value will match
 		:param ns: namespace of child that stanza must contain.
-		:param chained: chain together output of several handlers.
-		:param makefirst: insert handler in the beginning of handlers list instea
+		:param makefirst: insert handler in the beginning of handlers list instead
 			of	adding it to the end. Note that more common handlers i.e. w/o "typ"
 			and " will be called first nevertheless.
 		:param system: call handler even if NodeProcessed Exception were raised
 			already.
-		'''
-		# FIXME: What does chain mean and where is it handled?
+		"""
 		if not xmlns:
 			xmlns=self._owner.defaultNamespace
 		log.debug('Registering handler %s for "%s" type->%s ns->%s(%s)' %
@@ -286,18 +290,20 @@ class XMPPDispatcher(PlugIn):
 				'system':system})
 
 	def RegisterHandlerOnce(self, name, handler, typ='', ns='', xmlns=None,
-	makefirst=0, system=0):
-		''' Unregister handler after first call (not implemented yet).	'''
+			makefirst=0, system=0):
+		"""
+		Unregister handler after first call (not implemented yet)
+		"""
 		# FIXME Drop or implement
 		if not xmlns:
 			xmlns = self._owner.defaultNamespace
 		self.RegisterHandler(name, handler, typ, ns, xmlns, makefirst, system)
 
 	def UnregisterHandler(self, name, handler, typ='', ns='', xmlns=None):
-		'''
+		"""
 		Unregister handler. "typ" and "ns" must be specified exactly the same as
 		with registering.
-		'''
+		"""
 		if not xmlns:
 			xmlns = self._owner.defaultNamespace
 		if not typ and not ns:
@@ -316,58 +322,59 @@ class XMPPDispatcher(PlugIn):
 					pass
 
 	def RegisterDefaultHandler(self, handler):
-		'''
+		"""
 		Specify the handler that will be used if no NodeProcessed exception were
 		raised. This is returnStanzaHandler by default.
-		'''
+		"""
 		self._defaultHandler = handler
 
 	def RegisterEventHandler(self, handler):
-		'''
-		Register handler that will process events. F.e.
-		"FILERECEIVED" event. See common/connection: _event_dispatcher()
-		'''
+		"""
+		Register handler that will process events. F.e. "FILERECEIVED" event. See
+		common/connection: _event_dispatcher()
+		"""
 		self._eventHandler = handler
 
 	def returnStanzaHandler(self, conn, stanza):
-		'''
-		Return stanza back to the sender with <feature-not-implemented/> error set
-		'''
+		"""
+		Return stanza back to the sender with <feature-not-implemented/> error
+		set
+		"""
 		if stanza.getType() in ('get','set'):
 			conn._owner.send(Error(stanza, ERR_FEATURE_NOT_IMPLEMENTED))
 
 	def RegisterCycleHandler(self, handler):
-		'''
-		Register handler that will be called on every Dispatcher.Process() call.
-		'''
+		"""
+		Register handler that will be called on every Dispatcher.Process() call
+		"""
 		if handler not in self._cycleHandlers:
 			self._cycleHandlers.append(handler)
 
 	def UnregisterCycleHandler(self, handler):
-		'''
+		"""
 		Unregister handler that will is called on every Dispatcher.Process() call
-		'''
+		"""
 		if handler in self._cycleHandlers:
 			self._cycleHandlers.remove(handler)
 
 	def Event(self, realm, event, data):
-		'''
-		Raise some event.
+		"""
+		Raise some event
 
 		:param realm: scope of event. Usually a namespace.
 		:param event: the event itself. F.e. "SUCCESSFUL SEND".
 		:param data: data that comes along with event. Depends on event.
-		'''
+		"""
 		if self._eventHandler:
 			self._eventHandler(realm, event, data)
 		else:
 			log.warning('Received unhandled event: %s' % event)
 
 	def dispatch(self, stanza, session=None, direct=0):
-		'''
+		"""
 		Main procedure that performs XMPP stanza recognition and calling
-		apppropriate handlers for it. Called by simplexml.
-		'''
+		apppropriate handlers for it. Called by simplexml
+		"""
 		# FIXME: Where do we set session and direct. Why? What are those intended
 		# to do?
 
@@ -452,9 +459,9 @@ class XMPPDispatcher(PlugIn):
 			self._defaultHandler(session, stanza)
 
 	def _WaitForData(self, data):
-		'''
+		"""
 		Internal wrapper around ProcessNonBlocking. Will check for
-		'''
+		"""
 		if data is None:
 			return
 		res = self.ProcessNonBlocking(data)
@@ -483,12 +490,12 @@ class XMPPDispatcher(PlugIn):
 				del self._expected[_id]
 
 	def SendAndWaitForResponse(self, stanza, timeout=None, func=None, args=None):
-		'''
+		"""
 		Send stanza and wait for recipient's response to it. Will call transports
-		on_timeout callback if response is not retrieved in time.
+		on_timeout callback if response is not retrieved in time
 
 		Be aware: Only timeout of latest call of SendAndWait is active.
-		'''
+		"""
 		if timeout is None:
 			timeout = DEFAULT_TIMEOUT_SECONDS
 		_waitid = self.send(stanza)
@@ -501,15 +508,17 @@ class XMPPDispatcher(PlugIn):
 		return _waitid
 
 	def SendAndCallForResponse(self, stanza, func=None, args=None):
-		''' Put stanza on the wire and call back when recipient replies.
-			Additional callback arguments can be specified in args. '''
+		"""
+		Put stanza on the wire and call back when recipient replies. Additional
+		callback arguments can be specified in args
+		"""
 		self.SendAndWaitForResponse(stanza, 0, func, args)
 
 	def send(self, stanza, now=False):
-		'''
-		Wraps transports send method when plugged into NonBlockingClient.
-		Makes sure stanzas get ID and from tag.
-		'''
+		"""
+		Wrap transports send method when plugged into NonBlockingClient. Makes
+		sure stanzas get ID and from tag.
+		"""
 		ID = None
 		if type(stanza) not in [type(''), type(u'')]:
 			if isinstance(stanza, Protocol):
@@ -531,7 +540,9 @@ class BOSHDispatcher(XMPPDispatcher):
 		XMPPDispatcher.PlugIn(self, owner)
 
 	def StreamInit(self):
-		''' Send an initial stream header. '''
+		"""
+		Send an initial stream header
+		"""
 		self.Stream = simplexml.NodeBuilder()
 		self.Stream.dispatch = self.dispatch
 		self.Stream._dispatch_depth = 2
@@ -551,7 +562,9 @@ class BOSHDispatcher(XMPPDispatcher):
 		self._owner.Connection.send_init(after_SASL=self.after_SASL)
 
 	def StreamTerminate(self):
-		''' Send a stream terminator. '''
+		"""
+		Send a stream terminator
+		"""
 		self._owner.Connection.send_terminator()
 
 	def ProcessNonBlocking(self, data=None):
diff --git a/src/common/xmpp/features_nb.py b/src/common/xmpp/features_nb.py
index b713e38b2..a2eb669ca 100644
--- a/src/common/xmpp/features_nb.py
+++ b/src/common/xmpp/features_nb.py
@@ -15,10 +15,10 @@
 
 # $Id: features.py,v 1.22 2005/09/30 20:13:04 mikealbon Exp $
 
-'''
+"""
 Different stuff that wasn't worth separating it into modules
 (Registration, Privacy Lists, ...)
-'''
+"""
 
 from protocol import NS_REGISTER, NS_PRIVACY, NS_DATA, Iq, isResultNode, Node
 
@@ -38,13 +38,13 @@ def _on_default_response(disp, iq, cb):
 REGISTER_DATA_RECEIVED = 'REGISTER DATA RECEIVED'
 
 def getRegInfo(disp, host, info={}, sync=True):
-	'''
-	Gets registration form from remote host. Info dict can be prefilled
+	"""
+	Get registration form from remote host. Info dict can be prefilled
 	:param disp: plugged dispatcher instance
 	:param info: dict, like {'username':'joey'}.
 
 	See JEP-0077 for details.
-	'''
+	"""
 	iq=Iq('get',NS_REGISTER,to=host)
 	for i in info.keys():
 		iq.setTagData(i,info[i])
@@ -76,32 +76,32 @@ def _ReceivedRegInfo(con, resp, agent):
 		df[i.getName()] = i.getData()
 	con.Event(NS_REGISTER, REGISTER_DATA_RECEIVED, (agent,df,False,''))
 
-def register(disp, host, info, cb):
-	'''
-	Perform registration on remote server with provided info.
+def register(disp, host, info, cb, args=None):
+	"""
+	Perform registration on remote server with provided info
 
 	If registration fails you can get additional info from the dispatcher's
 	owner	attributes lastErrNode, lastErr and lastErrCode.
-	'''
+	"""
 	iq=Iq('set', NS_REGISTER, to=host)
 	if not isinstance(info, dict):
 		info=info.asDict()
 	for i in info.keys():
 		iq.setTag('query').setTagData(i,info[i])
-	disp.SendAndCallForResponse(iq, cb)
+	disp.SendAndCallForResponse(iq, cb, args)
 
 def unregister(disp, host, cb):
-	'''
+	"""
 	Unregisters with host (permanently removes account). Returns true on success
-	'''
+	"""
 	iq = Iq('set', NS_REGISTER, to=host, payload=[Node('remove')])
 	_on_default_response(disp, iq, cb)
 
 def changePasswordTo(disp, newpassword, host=None, cb = None):
-	'''
-	Changes password on specified or current (if not specified) server.
-	Returns true on success.
-	'''
+	"""
+	Changes password on specified or current (if not specified) server. Returns
+	true on success.
+	"""
 	if not host:
 		host = disp._owner.Server
 	iq = Iq('set',NS_REGISTER,to=host, payload=[Node('username',
@@ -123,10 +123,10 @@ PRIVACY_LIST_RECEIVED = 'PRIVACY LIST RECEIVED'
 PRIVACY_LISTS_ACTIVE_DEFAULT = 'PRIVACY LISTS ACTIVE DEFAULT'
 
 def getPrivacyLists(disp):
-	'''
-	Requests privacy lists from connected server.
-	Returns dictionary of existing lists on success.
-	'''
+	"""
+	Request privacy lists from connected server. Returns dictionary of existing
+	lists on success.
+	"""
 	iq = Iq('get', NS_PRIVACY)
 	def _on_response(resp):
 		dict_ = {'lists': []}
@@ -157,10 +157,10 @@ def getActiveAndDefaultPrivacyLists(disp):
 	disp.SendAndCallForResponse(iq, _on_response)
 
 def getPrivacyList(disp, listname):
-	'''
-	Requests specific privacy list listname. Returns list of XML nodes (rules)
+	"""
+	Request specific privacy list listname. Returns list of XML nodes (rules)
 	taken from the server responce.
-	'''
+	"""
 	def _on_response(resp):
 		if not isResultNode(resp):
 			disp.Event(NS_PRIVACY, PRIVACY_LIST_RECEIVED, (False))
@@ -170,10 +170,10 @@ def getPrivacyList(disp, listname):
 	disp.SendAndCallForResponse(iq, _on_response)
 
 def setActivePrivacyList(disp, listname=None, typ='active', cb=None):
-	'''
-	Switches privacy list 'listname' to specified type.
-	By default the type is 'active'. Returns true on success.
-	'''
+	"""
+	Switch privacy list 'listname' to specified type. By default the type is
+	'active'. Returns true on success.
+	"""
 	if listname:
 		attrs={'name':listname}
 	else:
@@ -182,15 +182,20 @@ def setActivePrivacyList(disp, listname=None, typ='active', cb=None):
 	_on_default_response(disp, iq, cb)
 
 def setDefaultPrivacyList(disp, listname=None):
-	''' Sets the default privacy list as 'listname'. Returns true on success. '''
+	"""
+	Set the default privacy list as 'listname'. Returns true on success
+	"""
 	return setActivePrivacyList(disp, listname,'default')
 
 def setPrivacyList(disp, listname, tags):
-	'''
-	Set the ruleset.
+	"""
+	Set the ruleset
+
+	'list' should be the simpleXML node formatted according to RFC 3921
+	(XMPP-IM) I.e. Node('list',{'name':listname},payload=[...]).
 
-	'list' should be the simpleXML node formatted according to RFC 3921 (XMPP-IM) 	I.e. Node('list',{'name':listname},payload=[...]).	Returns true on success.
-	'''
+	Returns true on success.
+	"""
 	iq = Iq('set', NS_PRIVACY, xmlns = '')
 	list_query = iq.getTag('query').setTag('list', {'name': listname})
 	for item in tags:
diff --git a/src/common/xmpp/idlequeue.py b/src/common/xmpp/idlequeue.py
index 63cb26bf6..8d61159da 100644
--- a/src/common/xmpp/idlequeue.py
+++ b/src/common/xmpp/idlequeue.py
@@ -12,10 +12,12 @@
 ##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ##   GNU General Public License for more details.
 
-'''
-Idlequeues are Gajim's network heartbeat. Transports can be plugged as
-idle objects and be informed about possible IO.
-'''
+
+"""
+Idlequeues are Gajim's network heartbeat. Transports can be plugged as idle
+objects and be informed about possible IO
+"""
+
 import os
 import select
 import logging
@@ -45,7 +47,9 @@ IS_CLOSED			= 16 # channel closed
 
 
 def get_idlequeue():
-	''' Get an appropriate idlequeue '''
+	"""
+	Get an appropriate idlequeue
+	"""
 	if os.name == 'nt':
 		# gobject.io_add_watch does not work on windows
 		return SelectIdleQueue()
@@ -59,34 +63,44 @@ def get_idlequeue():
 
 
 class IdleObject:
-	'''
-		Idle listener interface. Listed methods are called by IdleQueue.
-	'''
+	"""
+	Idle listener interface. Listed methods are called by IdleQueue.
+	"""
+
 	def __init__(self):
 		self.fd = -1 #: filedescriptor, must be unique for each IdleObject
 
 	def pollend(self):
-		''' called on stream failure '''
+		"""
+		Called on stream failure
+		"""
 		pass
 
 	def pollin(self):
-		''' called on new read event '''
+		"""
+		Called on new read event
+		"""
 		pass
 
 	def pollout(self):
-		''' called on new write event (connect in sockets is a pollout) '''
+		"""
+		Called on new write event (connect in sockets is a pollout)
+		"""
 		pass
 
 	def read_timeout(self):
-		''' called when timeout happened '''
+		"""
+		Called when timeout happened
+		"""
 		pass
 
 
 class IdleCommand(IdleObject):
-	'''
+	"""
 	Can be subclassed to execute commands asynchronously by the idlequeue.
 	Result will be optained via file descriptor of created pipe
-	'''
+	"""
+
 	def __init__(self, on_result):
 		IdleObject.__init__(self)
 		# how long (sec.) to wait for result ( 0 - forever )
@@ -111,7 +125,9 @@ class IdleCommand(IdleObject):
 		return ['echo', 'da']
 
 	def _compose_command_line(self):
-		''' return one line representation of command and its arguments '''
+		"""
+		Return one line representation of command and its arguments
+		"""
 		return  reduce(lambda left, right: left + ' ' + right,
 			self._compose_command_args())
 
@@ -187,7 +203,7 @@ class IdleCommand(IdleObject):
 
 
 class IdleQueue:
-	'''
+	"""
 	IdleQueue provide three distinct time based features. Uses select.poll()
 
 		1. Alarm timeout: Execute a callback after foo seconds
@@ -195,7 +211,8 @@ class IdleQueue:
 		has been set, but not removed in time.
 		3. Check file descriptor of plugged objects for read, write and error
 		events
-	'''
+	"""
+
 	# (timeout, boolean)
 	# Boolean is True if timeout is specified in seconds, False means miliseconds
 	PROCESS_TIMEOUT = (200, False)
@@ -215,13 +232,15 @@ class IdleQueue:
 		self._init_idle()
 
 	def _init_idle(self):
-		''' Hook method for subclassed. Will be called by __init__. '''
+		"""
+		Hook method for subclassed. Will be called by __init__
+		"""
 		self.selector = select.poll()
 
 	def set_alarm(self, alarm_cb, seconds):
-		'''
-		Sets up a new alarm. alarm_cb will be called after specified seconds.
-		'''
+		"""
+		Set up a new alarm. alarm_cb will be called after specified seconds.
+		"""
 		alarm_time = self.current_time() + seconds
 		# almost impossible, but in case we have another alarm_cb at this time
 		if alarm_time in self.alarms:
@@ -231,10 +250,10 @@ class IdleQueue:
 		return alarm_time
 
 	def remove_alarm(self, alarm_cb, alarm_time):
-		'''
-		Removes alarm callback alarm_cb scheduled on alarm_time.
-		Returns True if it was removed sucessfully, otherwise False
-		'''
+		"""
+		Remove alarm callback alarm_cb scheduled on alarm_time. Returns True if
+		it was removed sucessfully, otherwise False
+		"""
 		if not alarm_time in self.alarms:
 			return False
 		i = -1
@@ -251,7 +270,9 @@ class IdleQueue:
 			return False
 
 	def remove_timeout(self, fd, timeout=None):
-		''' Removes the read timeout '''
+		"""
+		Remove the read timeout
+		"""
 		log.info('read timeout removed for fd %s' % fd)
 		if fd in self.read_timeouts:
 			if timeout:
@@ -263,12 +284,12 @@ class IdleQueue:
 				del(self.read_timeouts[fd])
 
 	def set_read_timeout(self, fd, seconds, func=None):
-		'''
-		Sets a new timeout. If it is not removed after specified seconds,
-		func or obj.read_timeout() will be called.
+		"""
+		Seta a new timeout. If it is not removed after specified seconds,
+		func or obj.read_timeout() will be called
 
 		A filedescriptor fd can have several timeouts.
-		'''
+		"""
 		log_txt = 'read timeout set for fd %s on %s seconds' % (fd, seconds)
 		if func:
 			log_txt += ' with function ' + str(func)
@@ -280,11 +301,10 @@ class IdleQueue:
 			self.read_timeouts[fd] = {timeout: func}
 
 	def _check_time_events(self):
-		'''
+		"""
 		Execute and remove alarm callbacks and execute func() or read_timeout()
-		for plugged objects if specified time has ellapsed.
-		'''
-		log.info('check time evs')
+		for plugged objects if specified time has ellapsed
+		"""
 		current_time = self.current_time()
 
 		for fd, timeouts in self.read_timeouts.items():
@@ -313,13 +333,13 @@ class IdleQueue:
 					del(self.alarms[alarm_time])
 
 	def plug_idle(self, obj, writable=True, readable=True):
-		'''
-		Plug an IdleObject into idlequeue. Filedescriptor fd must be set.
+		"""
+		Plug an IdleObject into idlequeue. Filedescriptor fd must be set
 
 		:param obj: the IdleObject
 		:param writable: True if obj has data to sent
 		:param readable: True if obj expects data to be reiceived
-		'''
+		"""
 		if obj.fd == -1:
 			return
 		if obj.fd in self.queue:
@@ -339,11 +359,15 @@ class IdleQueue:
 		self._add_idle(obj.fd, flags)
 
 	def _add_idle(self, fd, flags):
-		''' Hook method for subclasses, called by plug_idle '''
+		"""
+		Hook method for subclasses, called by plug_idle
+		"""
 		self.selector.register(fd, flags)
 
 	def unplug_idle(self, fd):
-		''' Removed plugged IdleObject, specified by filedescriptor fd.  '''
+		"""
+		Remove plugged IdleObject, specified by filedescriptor fd
+		"""
 		if fd in self.queue:
 			del(self.queue[fd])
 			self._remove_idle(fd)
@@ -353,7 +377,9 @@ class IdleQueue:
 		return time()
 
 	def _remove_idle(self, fd):
-		''' Hook method for subclassed, called by unplug_idle '''
+		"""
+		Hook method for subclassed, called by unplug_idle
+		"""
 		self.selector.unregister(fd)
 
 	def _process_events(self, fd, flags):
@@ -379,13 +405,13 @@ class IdleQueue:
 		return False
 
 	def process(self):
-		'''
-		Process idlequeue. Check for any pending timeout or alarm events.
-		Call IdleObjects on possible and requested read, write and error events
-		on their file descriptors.
+		"""
+		Process idlequeue. Check for any pending timeout or alarm events.  Call
+		IdleObjects on possible and requested read, write and error events on
+		their file descriptors
 
 		Call this in regular intervals.
-		'''
+		"""
 		if not self.queue:
 			# check for timeouts/alert also when there are no active fds
 			self._check_time_events()
@@ -403,24 +429,26 @@ class IdleQueue:
 
 
 class SelectIdleQueue(IdleQueue):
-	'''
+	"""
 	Extends IdleQueue to use select.select() for polling
 
-	This class exisists for the sake of gtk2.8 on windows, which
-	doesn't seem to support io_add_watch properly (yet)
-	'''
+	This class exisists for the sake of gtk2.8 on windows, which doesn't seem to
+	support io_add_watch properly (yet)
+	"""
+
 	def _init_idle(self):
-		'''
-		Creates a dict, which maps file/pipe/sock descriptor to glib event id
-		'''
+		"""
+		Create a dict, which maps file/pipe/sock descriptor to glib event id
+		"""
 		self.read_fds = {}
 		self.write_fds = {}
 		self.error_fds = {}
 
 	def _add_idle(self, fd, flags):
-		''' this method is called when we plug a new idle object.
-		Remove descriptor to read/write/error lists, according flags
-		'''
+		"""
+		This method is called when we plug a new idle object. Remove descriptor
+		to read/write/error lists, according flags
+		"""
 		if flags & 3:
 			self.read_fds[fd] = fd
 		if flags & 4:
@@ -428,9 +456,10 @@ class SelectIdleQueue(IdleQueue):
 		self.error_fds[fd] = fd
 
 	def _remove_idle(self, fd):
-		''' this method is called when we unplug a new idle object.
-		Remove descriptor from read/write/error lists
-		'''
+		"""
+		This method is called when we unplug a new idle object. Remove descriptor
+		from read/write/error lists
+		"""
 		if fd in self.read_fds:
 			del(self.read_fds[fd])
 		if fd in self.write_fds:
@@ -466,27 +495,29 @@ class SelectIdleQueue(IdleQueue):
 
 
 class GlibIdleQueue(IdleQueue):
-	'''
-	Extends IdleQueue to use glib io_add_wath, instead of select/poll
-	In another 'non gui' implementation of Gajim IdleQueue can be used safetly.
-	'''
+	"""
+	Extends IdleQueue to use glib io_add_wath, instead of select/poll In another
+	'non gui' implementation of Gajim IdleQueue can be used safetly
+	"""
+
 	# (timeout, boolean)
 	# Boolean is True if timeout is specified in seconds, False means miliseconds
 	PROCESS_TIMEOUT = (2, True)
 
 	def _init_idle(self):
-		'''
+		"""
 		Creates a dict, which maps file/pipe/sock descriptor to glib event id
-		'''
+		"""
 		self.events = {}
 		# time() is already called in glib, we just get the last value
 		# overrides IdleQueue.current_time()
 		self.current_time = gobject.get_current_time
 
 	def _add_idle(self, fd, flags):
-		''' this method is called when we plug a new idle object.
-		Start listening for events from fd
-		'''
+		"""
+		This method is called when we plug a new idle object. Start listening for
+		events from fd
+		"""
 		res = gobject.io_add_watch(fd, flags, self._process_events,
 			priority=gobject.PRIORITY_LOW)
 		# store the id of the watch, so that we can remove it on unplug
@@ -501,9 +532,10 @@ class GlibIdleQueue(IdleQueue):
 			raise
 
 	def _remove_idle(self, fd):
-		''' this method is called when we unplug a new idle object.
-		Stop listening for events from fd
-		'''
+		"""
+		This method is called when we unplug a new idle object. Stop listening
+		for events from fd
+		"""
 		if not fd in self.events:
 			return
 		gobject.source_remove(self.events[fd])
diff --git a/src/common/xmpp/plugin.py b/src/common/xmpp/plugin.py
index 7f5d91ee1..2e4368eb2 100644
--- a/src/common/xmpp/plugin.py
+++ b/src/common/xmpp/plugin.py
@@ -14,33 +14,34 @@
 
 # $Id: client.py,v 1.52 2006/01/02 19:40:55 normanr Exp $
 
-'''
-Provides PlugIn class functionality to develop extentions for xmpppy.
-'''
+"""
+Provides PlugIn class functionality to develop extentions for xmpppy
+"""
 
 import logging
 log = logging.getLogger('gajim.c.x.plugin')
 
 class PlugIn:
-	'''
+	"""
 	Abstract xmpppy plugin infrastructure code, providing plugging in/out and
-	debugging functionality.
+	debugging functionality
 
 	Inherit to develop pluggable objects. No code change on the owner class
 	required (the object where we plug into)
 
 	For every instance of PlugIn class the 'owner' is the class in what the plug
 	was plugged.
-	'''
+	"""
+
 	def __init__(self):
 		self._exported_methods=[]
 
 	def PlugIn(self, owner):
-		'''
+		"""
 		Attach to owner and register ourself and our _exported_methods in it.
 		If defined by a subclass, call self.plugin(owner) to execute hook
-		code after plugging.
-		'''
+		code after plugging
+		"""
 		self._owner=owner
 		log.info('Plugging %s __INTO__ %s' % (self, self._owner))
 		if self.__class__.__name__ in owner.__dict__:
@@ -63,11 +64,11 @@ class PlugIn:
 			return self.plugin(owner)
 
 	def PlugOut(self):
-		'''
+		"""
 		Unregister our _exported_methods from owner and detach from it.
 		If defined by a subclass, call self.plugout() after unplugging to execute
-		hook code.
-		'''
+		hook code
+		"""
 		log.info('Plugging %s __OUT__ of %s.' % (self, self._owner))
 		for method in self._exported_methods:
 			del self._owner.__dict__[method.__name__]
@@ -85,13 +86,13 @@ class PlugIn:
 
 	@classmethod
 	def get_instance(cls, *args, **kwargs):
-		'''
-		Factory Method for object creation.
+		"""
+		Factory Method for object creation
 
 		Use this instead of directly initializing the class in order to make
 		unit testing easier. For testing, this method can be patched to inject
 		mock objects.
-		'''
+		"""
 		return cls(*args, **kwargs)
 
 # vim: se ts=3:
diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py
index 619771409..16b7ff058 100644
--- a/src/common/xmpp/protocol.py
+++ b/src/common/xmpp/protocol.py
@@ -14,14 +14,15 @@
 
 # $Id: protocol.py,v 1.52 2006/01/09 22:08:57 normanr Exp $
 
-'''
+"""
 Protocol module contains tools that are needed for processing of xmpp-related
-data structures, including jabber-objects like JID or different stanzas and sub-
-stanzas) handling routines.
-'''
+data structures, including jabber-objects like JID or different stanzas and
+sub- stanzas) handling routines
+"""
 
 from simplexml import Node, NodeBuilder
 import time
+
 NS_ACTIVITY	 ='http://jabber.org/protocol/activity'				  # XEP-0108
 NS_ADDRESS	  ='http://jabber.org/protocol/address'				   # XEP-0033
 NS_AGENTS	   ='jabber:iq:agents'
@@ -71,6 +72,7 @@ NS_JINGLE_RTP_VIDEO='urn:xmpp:jingle:apps:rtp:video'                    # XEP-01
 NS_JINGLE_RAW_UDP='urn:xmpp:jingle:transports:raw-udp:1'                # XEP-0177
 NS_JINGLE_ICE_UDP='urn:xmpp:jingle:transports:ice-udp:1'                # XEP-0176
 NS_LAST		 ='jabber:iq:last'
+NS_LOCATION  ='http://jabber.org/protocol/geoloc'								# XEP-0080
 NS_MESSAGE	  ='message'											  # Jabberd2
 NS_MOOD		 ='http://jabber.org/protocol/mood'					  # XEP-0107
 NS_MUC		  ='http://jabber.org/protocol/muc'
@@ -88,6 +90,7 @@ NS_PRIVACY	  ='jabber:iq:privacy'
 NS_PRIVATE	  ='jabber:iq:private'
 NS_PROFILE	  ='http://jabber.org/protocol/profile'				   # XEP-0154
 NS_PUBSUB	   ='http://jabber.org/protocol/pubsub'					# XEP-0060
+NS_PUBSUB_EVENT = 'http://jabber.org/protocol/pubsub#event'
 NS_PUBSUB_PUBLISH_OPTIONS = NS_PUBSUB + '#publish-options'			# XEP-0060
 NS_PUBSUB_OWNER ='http://jabber.org/protocol/pubsub#owner'			  # JEP-0060
 NS_REGISTER	 ='jabber:iq:register'
@@ -125,7 +128,7 @@ NS_DATA_VALIDATE='http://jabber.org/protocol/xdata-validate'			# XEP-0122
 NS_XMPP_STREAMS ='urn:ietf:params:xml:ns:xmpp-streams'
 NS_RECEIPTS	='urn:xmpp:receipts'
 
-xmpp_stream_error_conditions='''
+xmpp_stream_error_conditions = '''
 bad-format --  --  -- The entity has sent XML that cannot be processed.
 bad-namespace-prefix --  --  -- The entity has sent a namespace prefix that is unsupported, or has sent no namespace prefix on an element that requires such a prefix.
 conflict --  --  -- The server is closing the active stream for this entity because a new stream has been initiated that conflicts with the existing stream.
@@ -150,7 +153,8 @@ unsupported-encoding --  --  -- The initiating entity has encoded the stream in
 unsupported-stanza-type --  --  -- The initiating entity has sent a first-level child of the stream that is not supported by the server.
 unsupported-version --  --  -- The value of the 'version' attribute provided by the initiating entity in the stream header specifies a version of XMPP that is not supported by the server.
 xml-not-well-formed --  --  -- The initiating entity has sent XML that is not well-formed.'''
-xmpp_stanza_error_conditions='''
+
+xmpp_stanza_error_conditions = '''
 bad-request -- 400 -- modify -- The sender has sent XML that is malformed or that cannot be processed.
 conflict -- 409 -- cancel -- Access cannot be granted because an existing resource or session exists with the same name or address.
 feature-not-implemented -- 501 -- cancel -- The feature requested is not implemented by the recipient or server and therefore cannot be processed.
@@ -173,7 +177,8 @@ service-unavailable -- 503 -- cancel -- The server or recipient does not current
 subscription-required -- 407 -- auth -- The requesting entity is not authorized to access the requested service because a subscription is required.
 undefined-condition -- 500 --  -- Undefined Condition
 unexpected-request -- 400 -- wait -- The recipient or server understood the request but was not expecting it at this time (e.g., the request was out of order).'''
-sasl_error_conditions='''
+
+sasl_error_conditions = '''
 aborted --  --  -- The receiving entity acknowledges an <abort/> element sent by the initiating entity; sent in reply to the <abort/> element.
 incorrect-encoding --  --  -- The data provided by the initiating entity could not be processed because the [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003. encoding is incorrect (e.g., because the encoding does not adhere to the definition in Section 3 of [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003.); sent in reply to a <response/> element or an <auth/> element with initial response data.
 invalid-authzid --  --  -- The authzid provided by the initiating entity is invalid, either because it is incorrectly formatted or because the initiating entity does not have permissions to authorize that ID; sent in reply to a <response/> element or an <auth/> element with initial response data.
@@ -182,53 +187,115 @@ mechanism-too-weak --  --  -- The mechanism requested by the initiating entity i
 not-authorized --  --  -- The authentication failed because the initiating entity did not provide valid credentials (this includes but is not limited to the case of an unknown username); sent in reply to a <response/> element or an <auth/> element with initial response data.
 temporary-auth-failure --  --  -- The authentication failed because of a temporary error condition within the receiving entity; sent in reply to an <auth/> element or <response/> element.'''
 
-ERRORS,_errorcodes={},{}
-for ns,errname,errpool in ((NS_XMPP_STREAMS,'STREAM',xmpp_stream_error_conditions),
+ERRORS, _errorcodes = {}, {}
+for ns, errname, errpool in ((NS_XMPP_STREAMS, 'STREAM', xmpp_stream_error_conditions),
 						   (NS_STANZAS	 ,'ERR'   ,xmpp_stanza_error_conditions),
 						   (NS_SASL		,'SASL'  ,sasl_error_conditions)):
 	for err in errpool.split('\n')[1:]:
-		cond,code,typ,text=err.split(' -- ')
-		name=errname+'_'+cond.upper().replace('-','_')
-		locals()[name]=ns+' '+cond
-		ERRORS[ns+' '+cond]=[code,typ,text]
-		if code: _errorcodes[code]=cond
-del ns,errname,errpool,err,cond,code,typ,text
+		cond, code, typ, text = err.split(' -- ')
+		name = errname + '_' + cond.upper().replace('-', '_')
+		locals()[name] = ns + ' ' + cond
+		ERRORS[ns + ' ' + cond] = [code, typ, text]
+		if code:
+			_errorcodes[code] = cond
+del ns, errname, errpool, err, cond, code, typ, text
 
 def isResultNode(node):
-	''' Returns true if the node is a positive reply. '''
-	return node and node.getType()=='result'
+	"""
+	Return true if the node is a positive reply
+	"""
+	return node and node.getType() == 'result'
+
 def isErrorNode(node):
-	''' Returns true if the node is a negative reply. '''
-	return node and node.getType()=='error'
+	"""
+	Return true if the node is a negative reply
+	"""
+	return node and node.getType() == 'error'
 
 class NodeProcessed(Exception):
-	''' Exception that should be raised by handler when the handling should be stopped. '''
+	"""
+	Exception that should be raised by handler when the handling should be
+	stopped
+	"""
+	pass
+
 class StreamError(Exception):
-	''' Base exception class for stream errors.'''
-class BadFormat(StreamError): pass
-class BadNamespacePrefix(StreamError): pass
-class Conflict(StreamError): pass
-class ConnectionTimeout(StreamError): pass
-class HostGone(StreamError): pass
-class HostUnknown(StreamError): pass
-class ImproperAddressing(StreamError): pass
-class InternalServerError(StreamError): pass
-class InvalidFrom(StreamError): pass
-class InvalidID(StreamError): pass
-class InvalidNamespace(StreamError): pass
-class InvalidXML(StreamError): pass
-class NotAuthorized(StreamError): pass
-class PolicyViolation(StreamError): pass
-class RemoteConnectionFailed(StreamError): pass
-class ResourceConstraint(StreamError): pass
-class RestrictedXML(StreamError): pass
-class SeeOtherHost(StreamError): pass
-class SystemShutdown(StreamError): pass
-class UndefinedCondition(StreamError): pass
-class UnsupportedEncoding(StreamError): pass
-class UnsupportedStanzaType(StreamError): pass
-class UnsupportedVersion(StreamError): pass
-class XMLNotWellFormed(StreamError): pass
+	"""
+	Base exception class for stream errors
+	"""
+	pass
+
+class BadFormat(StreamError):
+	pass
+
+class BadNamespacePrefix(StreamError):
+	pass
+
+class Conflict(StreamError):
+	pass
+
+class ConnectionTimeout(StreamError):
+	pass
+
+class HostGone(StreamError):
+	pass
+
+class HostUnknown(StreamError):
+	pass
+
+class ImproperAddressing(StreamError):
+	pass
+
+class InternalServerError(StreamError):
+	pass
+
+class InvalidFrom(StreamError):
+	pass
+
+class InvalidID(StreamError):
+	pass
+
+class InvalidNamespace(StreamError):
+	pass
+
+class InvalidXML(StreamError):
+	pass
+
+class NotAuthorized(StreamError):
+	pass
+
+class PolicyViolation(StreamError):
+	pass
+
+class RemoteConnectionFailed(StreamError):
+	pass
+
+class ResourceConstraint(StreamError):
+	pass
+
+class RestrictedXML(StreamError):
+	pass
+
+class SeeOtherHost(StreamError):
+	pass
+
+class SystemShutdown(StreamError):
+	pass
+
+class UndefinedCondition(StreamError):
+	pass
+
+class UnsupportedEncoding(StreamError):
+	pass
+
+class UnsupportedStanzaType(StreamError):
+	pass
+
+class UnsupportedVersion(StreamError):
+	pass
+
+class XMLNotWellFormed(StreamError):
+	pass
 
 stream_exceptions = {'bad-format': BadFormat,
 					 'bad-namespace-prefix': BadNamespacePrefix,
@@ -256,250 +323,430 @@ stream_exceptions = {'bad-format': BadFormat,
 					 'xml-not-well-formed': XMLNotWellFormed}
 
 class JID:
-	''' JID object. JID can be built from string, modified, compared, serialised into string. '''
+	"""
+	JID can be built from string, modified, compared, serialised into string
+	"""
+
 	def __init__(self, jid=None, node='', domain='', resource=''):
-		''' Constructor. JID can be specified as string (jid argument) or as separate parts.
-			Examples:
-			JID('node@domain/resource')
-			JID(node='node',domain='domain.org')
-		'''
-		if not jid and not domain: raise ValueError('JID must contain at least domain name')
-		elif type(jid)==type(self): self.node,self.domain,self.resource=jid.node,jid.domain,jid.resource
-		elif domain: self.node,self.domain,self.resource=node,domain,resource
+		"""
+		JID can be specified as string (jid argument) or as separate parts
+
+		Examples:
+		JID('node@domain/resource')
+		JID(node='node',domain='domain.org')
+		"""
+		if not jid and not domain:
+			raise ValueError('JID must contain at least domain name')
+		elif type(jid) == type(self):
+			self.node, self.domain, self.resource = jid.node, jid.domain, jid.resource
+		elif domain:
+			self.node, self.domain, self.resource = node, domain, resource
 		else:
-			if jid.find('@')+1: self.node,jid=jid.split('@',1)
-			else: self.node=''
-			if jid.find('/')+1: self.domain,self.resource=jid.split('/',1)
-			else: self.domain,self.resource=jid,''
+			if jid.find('@') + 1:
+				self.node,jid = jid.split('@', 1)
+			else:
+				self.node = ''
+			if jid.find('/')+1:
+				self.domain, self.resource = jid.split('/',1)
+			else:
+				self.domain, self.resource = jid, ''
+
 	def getNode(self):
-		''' Return the node part of the JID '''
+		"""
+		Return the node part of the JID
+		"""
 		return self.node
-	def setNode(self,node):
-		''' Set the node part of the JID to new value. Specify None to remove the node part.'''
-		self.node=node.lower()
+
+	def setNode(self, node):
+		"""
+		Set the node part of the JID to new value. Specify None to remove the node part
+		"""
+		self.node = node.lower()
+
 	def getDomain(self):
-		''' Return the domain part of the JID '''
+		"""
+		Return the domain part of the JID
+		"""
 		return self.domain
-	def setDomain(self,domain):
-		''' Set the domain part of the JID to new value.'''
-		self.domain=domain.lower()
+
+	def setDomain(self, domain):
+		"""
+		Set the domain part of the JID to new value
+		"""
+		self.domain = domain.lower()
+
 	def getResource(self):
-		''' Return the resource part of the JID '''
+		"""
+		Return the resource part of the JID
+		"""
 		return self.resource
-	def setResource(self,resource):
-		''' Set the resource part of the JID to new value. Specify None to remove the resource part.'''
-		self.resource=resource
+
+	def setResource(self, resource):
+		"""
+		Set the resource part of the JID to new value. Specify None to remove the
+		resource part
+		"""
+		self.resource = resource
+
 	def getStripped(self):
-		''' Return the bare representation of JID. I.e. string value w/o resource. '''
+		"""
+		Return the bare representation of JID. I.e. string value w/o resource
+		"""
 		return self.__str__(0)
+
 	def __eq__(self, other):
-		''' Compare the JID to another instance or to string for equality. '''
-		try: other=JID(other)
-		except ValueError: return 0
-		return self.resource==other.resource and self.__str__(0) == other.__str__(0)
+		"""
+		Compare the JID to another instance or to string for equality
+		"""
+		try:
+			other = JID(other)
+		except ValueError:
+			return 0
+		return self.resource == other.resource and self.__str__(0) == other.__str__(0)
+
 	def __ne__(self, other):
-		''' Compare the JID to another instance or to string for non-equality. '''
+		"""
+		Compare the JID to another instance or to string for non-equality
+		"""
 		return not self.__eq__(other)
+
 	def bareMatch(self, other):
-		''' Compare the node and domain parts of the JID's for equality. '''
+		"""
+		Compare the node and domain parts of the JID's for equality
+		"""
 		return self.__str__(0) == JID(other).__str__(0)
-	def __str__(self,wresource=1):
-		''' Serialise JID into string. '''
-		if self.node: jid=self.node+'@'+self.domain
-		else: jid=self.domain
-		if wresource and self.resource: return jid+'/'+self.resource
+
+	def __str__(self, wresource=1):
+		"""
+		Serialise JID into string
+		"""
+		if self.node:
+			jid = self.node + '@' + self.domain
+		else:
+			jid = self.domain
+		if wresource and self.resource:
+			return jid + '/' + self.resource
 		return jid
+
 	def __hash__(self):
-		''' Produce hash of the JID, Allows to use JID objects as keys of the dictionary. '''
-		return hash(self.__str__())
+		"""
+		Produce hash of the JID, Allows to use JID objects as keys of the dictionary
+		"""
+		return hash(str(self))
 
 class BOSHBody(Node):
-	'''
+	"""
 	<body> tag that wraps usual XMPP stanzas in XMPP over BOSH
-	'''
+	"""
+
 	def __init__(self, attrs={}, payload=[], node=None):
 		Node.__init__(self, tag='body', attrs=attrs, payload=payload, node=node)
 		self.setNamespace(NS_HTTP_BIND)
 
 
 class Protocol(Node):
-	''' A "stanza" object class. Contains methods that are common for presences, iqs and messages. '''
-	def __init__(self, name=None, to=None, typ=None, frm=None, attrs={}, payload=[], timestamp=None, xmlns=None, node=None):
-		''' Constructor, name is the name of the stanza i.e. 'message' or 'presence' or 'iq'.
-			to is the value of 'to' attribure, 'typ' - 'type' attribute
-			frn - from attribure, attrs - other attributes mapping,
-			payload - same meaning as for simplexml payload definition
-			timestamp - the time value that needs to be stamped over stanza
-			xmlns - namespace of top stanza node
-			node - parsed or unparsed stana to be taken as prototype.
-		'''
-		if not attrs: attrs={}
-		if to: attrs['to']=to
-		if frm: attrs['from']=frm
-		if typ: attrs['type']=typ
+	"""
+	A "stanza" object class. Contains methods that are common for presences, iqs
+	and messages
+	"""
+
+	def __init__(self, name=None, to=None, typ=None, frm=None, attrs={},
+			payload=[], timestamp=None, xmlns=None, node=None):
+		"""
+		Constructor, name is the name of the stanza i.e. 'message' or 'presence' or 'iq'
+
+		to is the value of 'to' attribure, 'typ' - 'type' attribute
+		frn - from attribure, attrs - other attributes mapping,
+		payload - same meaning as for simplexml payload definition
+		timestamp - the time value that needs to be stamped over stanza
+		xmlns - namespace of top stanza node
+		node - parsed or unparsed stana to be taken as prototype.
+		"""
+		if not attrs:
+			attrs = {}
+		if to:
+			attrs['to'] = to
+		if frm:
+			attrs['from'] = frm
+		if typ:
+			attrs['type'] = typ
 		Node.__init__(self, tag=name, attrs=attrs, payload=payload, node=node)
-		if not node and xmlns: self.setNamespace(xmlns)
-		if self['to']: self.setTo(self['to'])
-		if self['from']: self.setFrom(self['from'])
-		if node and type(self)==type(node) and self.__class__==node.__class__ and self.attrs.has_key('id'): del self.attrs['id']
-		self.timestamp=None
-		for d in self.getTags('delay',namespace=NS_DELAY2):
+		if not node and xmlns:
+			self.setNamespace(xmlns)
+		if self['to']:
+			self.setTo(self['to'])
+		if self['from']:
+			self.setFrom(self['from'])
+		if node and type(self) == type(node) and self.__class__ == node.__class__ and self.attrs.has_key('id'):
+			del self.attrs['id']
+		self.timestamp = None
+		for d in self.getTags('delay', namespace=NS_DELAY2):
 			try:
 				if d.getAttr('stamp') < self.getTimestamp2():
 					self.setTimestamp(d.getAttr('stamp'))
 			except Exception:
 				pass
 		if not self.timestamp:
-			for x in self.getTags('x',namespace=NS_DELAY):
+			for x in self.getTags('x', namespace=NS_DELAY):
 				try:
 					if x.getAttr('stamp') < self.getTimestamp():
 						self.setTimestamp(x.getAttr('stamp'))
 				except Exception:
 					pass
-		if timestamp is not None: self.setTimestamp(timestamp)  # To auto-timestamp stanza just pass timestamp=''
+		if timestamp is not None:
+			self.setTimestamp(timestamp)  # To auto-timestamp stanza just pass timestamp=''
+
 	def getTo(self):
-		''' Return value of the 'to' attribute. '''
-		try: return self['to']
-		except: return None
+		"""
+		Return value of the 'to' attribute
+		"""
+		try:
+			return self['to']
+		except:
+			return None
+
 	def getFrom(self):
-		''' Return value of the 'from' attribute. '''
-		try: return self['from']
-		except: return None
+		"""
+		Return value of the 'from' attribute
+		"""
+		try:
+			return self['from']
+		except:
+			return None
+
 	def getTimestamp(self):
-		''' Return the timestamp in the 'yyyymmddThhmmss' format. '''
-		if self.timestamp: return self.timestamp
+		"""
+		Return the timestamp in the 'yyyymmddThhmmss' format
+		"""
+		if self.timestamp:
+			return self.timestamp
 		return time.strftime('%Y%m%dT%H:%M:%S', time.gmtime())
+
 	def getTimestamp2(self):
-		  """ Return the timestamp in the 'yyyymmddThhmmss' format. """
-		  if self.timestamp: return self.timestamp
-		  return time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())
+		"""
+		Return the timestamp in the 'yyyymmddThhmmss' format
+		"""
+		if self.timestamp:
+			return self.timestamp
+		return time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())
+
 	def getID(self):
-		''' Return the value of the 'id' attribute. '''
+		"""
+		Return the value of the 'id' attribute
+		"""
 		return self.getAttr('id')
-	def setTo(self,val):
-		''' Set the value of the 'to' attribute. '''
+
+	def setTo(self, val):
+		"""
+		Set the value of the 'to' attribute
+		"""
 		self.setAttr('to', JID(val))
+
 	def getType(self):
-		''' Return the value of the 'type' attribute. '''
+		"""
+		Return the value of the 'type' attribute
+		"""
 		return self.getAttr('type')
-	def setFrom(self,val):
-		''' Set the value of the 'from' attribute. '''
+
+	def setFrom(self, val):
+		"""
+		Set the value of the 'from' attribute
+		"""
 		self.setAttr('from', JID(val))
-	def setType(self,val):
-		''' Set the value of the 'type' attribute. '''
+
+	def setType(self, val):
+		"""
+		Set the value of the 'type' attribute
+		"""
 		self.setAttr('type', val)
-	def setID(self,val):
-		''' Set the value of the 'id' attribute. '''
+
+	def setID(self, val):
+		"""
+		Set the value of the 'id' attribute
+		"""
 		self.setAttr('id', val)
+
 	def getError(self):
-		''' Return the error-condition (if present) or the textual description of the error (otherwise). '''
-		errtag=self.getTag('error')
+		"""
+		Return the error-condition (if present) or the textual description of the
+		error (otherwise)
+		"""
+		errtag = self.getTag('error')
 		if errtag:
 			for tag in errtag.getChildren():
-				if tag.getName()<>'text': return tag.getName()
+				if tag.getName() <> 'text':
+					return tag.getName()
 			return errtag.getData()
+
 	def getErrorMsg(self):
-		''' Return the textual description of the error (if present) or the error condition '''
-		errtag=self.getTag('error')
+		"""
+		Return the textual description of the error (if present) or the error condition
+		"""
+		errtag = self.getTag('error')
 		if errtag:
 			for tag in errtag.getChildren():
-				if tag.getName()=='text': return tag.getData()
+				if tag.getName() == 'text':
+					return tag.getData()
 			return self.getError()
+
 	def getErrorCode(self):
-		''' Return the error code. Obsolete. '''
+		"""
+		Return the error code. Obsolete.
+		"""
 		return self.getTagAttr('error','code')
+
 	def setError(self,error,code=None):
-		''' Set the error code. Obsolete. Use error-conditions instead. '''
+		"""
+		Set the error code. Obsolete. Use error-conditions instead
+		"""
 		if code:
-			if str(code) in _errorcodes.keys(): error=ErrorNode(_errorcodes[str(code)],text=error)
-			else: error=ErrorNode(ERR_UNDEFINED_CONDITION,code=code,typ='cancel',text=error)
-		elif type(error) in [type(''),type(u'')]: error=ErrorNode(error)
+			if str(code) in _errorcodes.keys():
+				error = ErrorNode(_errorcodes[str(code)], text=error)
+			else:
+				error = ErrorNode(ERR_UNDEFINED_CONDITION, code=code, typ='cancel', text=error)
+		elif type(error) in [type(''),type(u'')]:
+			error=ErrorNode(error)
 		self.setType('error')
 		self.addChild(node=error)
-	def setTimestamp(self,val=None):
-		'''Set the timestamp. timestamp should be the yyyymmddThhmmss string.'''
-		if not val: val=time.strftime('%Y%m%dT%H:%M:%S', time.gmtime())
+
+	def setTimestamp(self, val=None):
+		"""
+		Set the timestamp. timestamp should be the yyyymmddThhmmss string
+		"""
+		if not val:
+			val = time.strftime('%Y%m%dT%H:%M:%S', time.gmtime())
 		self.timestamp=val
-		self.setTag('x',{'stamp':self.timestamp},namespace=NS_DELAY)
+		self.setTag('x', {'stamp': self.timestamp}, namespace=NS_DELAY)
+
 	def getProperties(self):
-		''' Return the list of namespaces to which belongs the direct childs of element'''
-		props=[]
+		"""
+		Return the list of namespaces to which belongs the direct childs of element
+		"""
+		props = []
 		for child in self.getChildren():
-			prop=child.getNamespace()
-			if prop not in props: props.append(prop)
+			prop = child.getNamespace()
+			if prop not in props:
+				props.append(prop)
 		return props
-	def __setitem__(self,item,val):
-		''' Set the item 'item' to the value 'val'.'''
-		if item in ['to','from']: val=JID(val)
-		return self.setAttr(item,val)
+
+	def __setitem__(self, item, val):
+		"""
+		Set the item 'item' to the value 'val'
+		"""
+		if item in ['to','from']:
+			val = JID(val)
+		return self.setAttr(item, val)
 
 
 class Message(Protocol):
-	''' XMPP Message stanza - "push" mechanism.'''
-	def __init__(self, to=None, body=None, xhtml=None, typ=None, subject=None, attrs={}, frm=None, payload=[], timestamp=None, xmlns=NS_CLIENT, node=None):
-		''' Create message object. You can specify recipient, text of message, type of message
-			any additional attributes, sender of the message, any additional payload (f.e. jabber:x:delay element) and namespace in one go.
-			Alternatively you can pass in the other XML object as the 'node' parameted to replicate it as message. '''
-		Protocol.__init__(self, 'message', to=to, typ=typ, attrs=attrs, frm=frm, payload=payload, timestamp=timestamp, xmlns=xmlns, node=node)
-		if body: self.setBody(body)
-		if xhtml: self.setXHTML(xhtml)
-		if subject is not None: self.setSubject(subject)
+	"""
+	XMPP Message stanza - "push" mechanism
+	"""
+
+	def __init__(self, to=None, body=None, xhtml=None, typ=None, subject=None,
+			attrs={}, frm=None, payload=[], timestamp=None, xmlns=NS_CLIENT,
+			node=None):
+		"""
+		You can specify recipient, text of message, type of message any
+		additional attributes, sender of the message, any additional payload
+		(f.e. jabber:x:delay element) and namespace in one go.
+
+		Alternatively you can pass in the other XML object as the 'node'
+		parameted to replicate it as message
+		"""
+		Protocol.__init__(self, 'message', to=to, typ=typ, attrs=attrs, frm=frm,
+				payload=payload, timestamp=timestamp, xmlns=xmlns, node=node)
+		if body:
+			self.setBody(body)
+		if xhtml:
+			self.setXHTML(xhtml)
+		if subject is not None:
+			self.setSubject(subject)
+
 	def getBody(self):
-		''' Returns text of the message. '''
+		"""
+		Return text of the message
+		"""
 		return self.getTagData('body')
+
 	def getXHTML(self, xmllang=None):
-		''' Returns serialized xhtml-im element text of the message.
+		"""
+		Return serialized xhtml-im element text of the message
 
-			TODO: Returning a DOM could make rendering faster.'''
+		TODO: Returning a DOM could make rendering faster.
+		"""
 		xhtml = self.getTag('html')
 		if xhtml:
 			if xmllang:
-				body = xhtml.getTag('body', attrs={'xml:lang':xmllang})
+				body = xhtml.getTag('body', attrs={'xml:lang': xmllang})
 			else:
 				body = xhtml.getTag('body')
 			return str(body)
 		return None
+
 	def getSubject(self):
-		''' Returns subject of the message. '''
+		"""
+		Return subject of the message
+		"""
 		return self.getTagData('subject')
+
 	def getThread(self):
-		''' Returns thread of the message. '''
+		"""
+		Return thread of the message
+		"""
 		return self.getTagData('thread')
-	def setBody(self,val):
-		''' Sets the text of the message. '''
-		self.setTagData('body',val)
 
-	def setXHTML(self,val,xmllang=None):
-		''' Sets the xhtml text of the message (XEP-0071).
-			The parameter is the "inner html" to the body.'''
+	def setBody(self, val):
+		"""
+		Set the text of the message"""
+		self.setTagData('body', val)
+
+	def setXHTML(self, val, xmllang=None):
+		"""
+		Sets the xhtml text of the message (XEP-0071). The parameter is the
+		"inner html" to the body.
+		"""
 		try:
 			if xmllang:
-				dom = NodeBuilder('<body xmlns="'+NS_XHTML+'" xml:lang="'+xmllang+'" >' + val + '</body>').getDom()
+				dom = NodeBuilder('<body xmlns="%s" xml:lang="%s">%s</body>' % (NS_XHTML, xmllang, val)).getDom()
 			else:
-				dom = NodeBuilder('<body xmlns="'+NS_XHTML+'">'+val+'</body>',0).getDom()
+				dom = NodeBuilder('<body xmlns="%s">%s</body>, 0' % (NS_XHTM, val)).getDom()
 			if self.getTag('html'):
 				self.getTag('html').addChild(node=dom)
 			else:
-				self.setTag('html',namespace=NS_XHTML_IM).addChild(node=dom)
+				self.setTag('html', namespace=NS_XHTML_IM).addChild(node=dom)
 		except Exception, e:
 			print "Error", e
-			#FIXME: log. we could not set xhtml (parse error, whatever)
-	def setSubject(self,val):
-		''' Sets the subject of the message. '''
-		self.setTagData('subject',val)
-	def setThread(self,val):
-		''' Sets the thread of the message. '''
-		self.setTagData('thread',val)
-	def buildReply(self,text=None):
-		''' Builds and returns another message object with specified text.
-			The to, from and thread properties of new message are pre-set as reply to this message. '''
-		m=Message(to=self.getFrom(),frm=self.getTo(),body=text)
-		th=self.getThread()
-		if th: m.setThread(th)
+			# FIXME: log. we could not set xhtml (parse error, whatever)
+
+	def setSubject(self, val):
+		"""
+		Set the subject of the message
+		"""
+		self.setTagData('subject', val)
+
+	def setThread(self, val):
+		"""
+		Set the thread of the message
+		"""
+		self.setTagData('thread', val)
+
+	def buildReply(self, text=None):
+		"""
+		Builds and returns another message object with specified text. The to,
+		from and thread properties of new message are pre-set as reply to this
+		message
+		"""
+		m = Message(to=self.getFrom(), frm=self.getTo(), body=text)
+		th = self.getThread()
+		if th:
+			m.setThread(th)
 		return m
+
 	def getStatusCode(self):
-		'''Returns the status code of the message (for groupchat config
-		change)'''
+		"""
+		Return the status code of the message (for groupchat config change)
+		"""
 		attrs = []
 		for xtag in self.getTags('x'):
 			for child in xtag.getTags('status'):
@@ -507,68 +754,117 @@ class Message(Protocol):
 		return attrs
 
 class Presence(Protocol):
-	''' XMPP Presence object.'''
-	def __init__(self, to=None, typ=None, priority=None, show=None, status=None, attrs={}, frm=None, timestamp=None, payload=[], xmlns=NS_CLIENT, node=None):
-		''' Create presence object. You can specify recipient, type of message, priority, show and status values
-			any additional attributes, sender of the presence, timestamp, any additional payload (f.e. jabber:x:delay element) and namespace in one go.
-			Alternatively you can pass in the other XML object as the 'node' parameted to replicate it as presence. '''
-		Protocol.__init__(self, 'presence', to=to, typ=typ, attrs=attrs, frm=frm, payload=payload, timestamp=timestamp, xmlns=xmlns, node=node)
-		if priority: self.setPriority(priority)
-		if show: self.setShow(show)
-		if status: self.setStatus(status)
+
+	def __init__(self, to=None, typ=None, priority=None, show=None, status=None,
+			attrs={}, frm=None, timestamp=None, payload=[], xmlns=NS_CLIENT,
+			node=None):
+		"""
+		You can specify recipient, type of message, priority, show and status
+		values any additional attributes, sender of the presence, timestamp, any
+		additional payload (f.e. jabber:x:delay element) and namespace in one go.
+		Alternatively you can pass in the other XML object as the 'node'
+		parameted to replicate it as presence
+		"""
+		Protocol.__init__(self, 'presence', to=to, typ=typ, attrs=attrs, frm=frm,
+				payload=payload, timestamp=timestamp, xmlns=xmlns, node=node)
+		if priority:
+			self.setPriority(priority)
+		if show:
+			self.setShow(show)
+		if status:
+			self.setStatus(status)
+
 	def getPriority(self):
-		''' Returns the priority of the message. '''
+		"""
+		Return the priority of the message
+		"""
 		return self.getTagData('priority')
+
 	def getShow(self):
-		''' Returns the show value of the message. '''
+		"""
+		Return the show value of the message
+		"""
 		return self.getTagData('show')
+
 	def getStatus(self):
-		''' Returns the status string of the message. '''
+		"""
+		Return the status string of the message
+		"""
 		return self.getTagData('status')
-	def setPriority(self,val):
-		''' Sets the priority of the message. '''
-		self.setTagData('priority',val)
-	def setShow(self,val):
-		''' Sets the show value of the message. '''
-		self.setTagData('show',val)
-	def setStatus(self,val):
-		''' Sets the status string of the message. '''
-		self.setTagData('status',val)
-
-	def _muc_getItemAttr(self,tag,attr):
+
+	def setPriority(self, val):
+		"""
+		Set the priority of the message
+		"""
+		self.setTagData('priority', val)
+
+	def setShow(self, val):
+		"""
+		Set the show value of the message
+		"""
+		self.setTagData('show', val)
+
+	def setStatus(self, val):
+		"""
+		Set the status string of the message
+		"""
+		self.setTagData('status', val)
+
+	def _muc_getItemAttr(self, tag, attr):
 		for xtag in self.getTags('x'):
 			if xtag.getNamespace() not in (NS_MUC_USER, NS_MUC_ADMIN):
 				continue
 			for child in xtag.getTags(tag):
 				return child.getAttr(attr)
-	def _muc_getSubTagDataAttr(self,tag,attr):
+
+	def _muc_getSubTagDataAttr(self, tag, attr):
 		for xtag in self.getTags('x'):
 			if xtag.getNamespace() not in (NS_MUC_USER, NS_MUC_ADMIN):
 				continue
 			for child in xtag.getTags('item'):
 				for cchild in child.getTags(tag):
-					return cchild.getData(),cchild.getAttr(attr)
-		return None,None
+					return cchild.getData(), cchild.getAttr(attr)
+		return None, None
+
 	def getRole(self):
-		'''Returns the presence role (for groupchat)'''
-		return self._muc_getItemAttr('item','role')
+		"""
+		Return the presence role (for groupchat)
+		"""
+		return self._muc_getItemAttr('item', 'role')
 	def getAffiliation(self):
-		'''Returns the presence affiliation (for groupchat)'''
-		return self._muc_getItemAttr('item','affiliation')
+		"""
+		Return the presence affiliation (for groupchat)
+		"""
+		return self._muc_getItemAttr('item', 'affiliation')
+
 	def getNewNick(self):
-		'''Returns the status code of the presence (for groupchat)'''
-		return self._muc_getItemAttr('item','nick')
+		"""
+		Return the status code of the presence (for groupchat)
+		"""
+		return self._muc_getItemAttr('item', 'nick')
+
 	def getJid(self):
-		'''Returns the presence jid (for groupchat)'''
-		return self._muc_getItemAttr('item','jid')
+		"""
+		Return the presence jid (for groupchat)
+		"""
+		return self._muc_getItemAttr('item', 'jid')
+
 	def getReason(self):
-		'''Returns the reason of the presence (for groupchat)'''
-		return self._muc_getSubTagDataAttr('reason','')[0]
+		"""
+		Returns the reason of the presence (for groupchat)
+		"""
+		return self._muc_getSubTagDataAttr('reason', '')[0]
+
 	def getActor(self):
-		'''Returns the reason of the presence (for groupchat)'''
-		return self._muc_getSubTagDataAttr('actor','jid')[1]
+		"""
+		Return the reason of the presence (for groupchat)
+		"""
+		return self._muc_getSubTagDataAttr('actor', 'jid')[1]
+
 	def getStatusCode(self):
-		'''Returns the status code of the presence (for groupchat)'''
+		"""
+		Return the status code of the presence (for groupchat)
+		"""
 		attrs = []
 		for xtag in self.getTags('x'):
 			for child in xtag.getTags('status'):
@@ -576,244 +872,435 @@ class Presence(Protocol):
 		return attrs
 
 class Iq(Protocol):
-	''' XMPP Iq object - get/set dialog mechanism. '''
-	def __init__(self, typ=None, queryNS=None, attrs={}, to=None, frm=None, payload=[], xmlns=NS_CLIENT, node=None):
-		''' Create Iq object. You can specify type, query namespace
-			any additional attributes, recipient of the iq, sender of the iq, any additional payload (f.e. jabber:x:data node) and namespace in one go.
-			Alternatively you can pass in the other XML object as the 'node' parameted to replicate it as an iq. '''
+	"""
+	XMPP Iq object - get/set dialog mechanism
+	"""
+
+	def __init__(self, typ=None, queryNS=None, attrs={}, to=None, frm=None,
+			payload=[], xmlns=NS_CLIENT, node=None):
+		"""
+		You can specify type, query namespace any additional attributes,
+		recipient of the iq, sender of the iq, any additional payload (f.e.
+		jabber:x:data node) and namespace in one go.
+
+		Alternatively you can pass in the other XML object as the 'node'
+		parameted to replicate it as an iq
+		"""
 		Protocol.__init__(self, 'iq', to=to, typ=typ, attrs=attrs, frm=frm, xmlns=xmlns, node=node)
-		if payload: self.setQueryPayload(payload)
-		if queryNS: self.setQueryNS(queryNS)
+		if payload:
+			self.setQueryPayload(payload)
+		if queryNS:
+			self.setQueryNS(queryNS)
+
 	def getQueryNS(self):
-		''' Return the namespace of the 'query' child element.'''
-		tag=self.getTag('query')
-		if tag: return tag.getNamespace()
+		"""
+		Return the namespace of the 'query' child element
+		"""
+		tag = self.getTag('query')
+		if tag:
+			return tag.getNamespace()
+
 	def getQuerynode(self):
-		''' Return the 'node' attribute value of the 'query' child element.'''
-		return self.getTagAttr('query','node')
+		"""
+		Return the 'node' attribute value of the 'query' child element
+		"""
+		return self.getTagAttr('query', 'node')
+
 	def getQueryPayload(self):
-		''' Return the 'query' child element payload.'''
-		tag=self.getTag('query')
-		if tag: return tag.getPayload()
+		"""
+		Return the 'query' child element payload
+		"""
+		tag = self.getTag('query')
+		if tag:
+			return tag.getPayload()
+
 	def getQueryChildren(self):
-		''' Return the 'query' child element child nodes.'''
-		tag=self.getTag('query')
-		if tag: return tag.getChildren()
-	def setQueryNS(self,namespace):
-		''' Set the namespace of the 'query' child element.'''
+		"""
+		Return the 'query' child element child nodes
+		"""
+		tag = self.getTag('query')
+		if tag:
+			return tag.getChildren()
+
+	def setQueryNS(self, namespace):
+		"""
+		Set the namespace of the 'query' child element
+		"""
 		self.setTag('query').setNamespace(namespace)
-	def setQueryPayload(self,payload):
-		''' Set the 'query' child element payload.'''
+
+	def setQueryPayload(self, payload):
+		"""
+		Set the 'query' child element payload
+		"""
 		self.setTag('query').setPayload(payload)
-	def setQuerynode(self,node):
-		''' Set the 'node' attribute value of the 'query' child element.'''
-		self.setTagAttr('query','node',node)
-	def buildReply(self,typ):
-		''' Builds and returns another Iq object of specified type.
-			The to, from and query child node of new Iq are pre-set as reply to this Iq. '''
-		iq=Iq(typ,to=self.getFrom(),frm=self.getTo(),attrs={'id':self.getID()})
-		if self.getTag('query'): iq.setQueryNS(self.getQueryNS())
+
+	def setQuerynode(self, node):
+		"""
+		Set the 'node' attribute value of the 'query' child element
+		"""
+		self.setTagAttr('query', 'node', node)
+
+	def buildReply(self, typ):
+		"""
+		Build and return another Iq object of specified type. The to, from and
+		query child node of new Iq are pre-set as reply to this Iq.
+		"""
+		iq = Iq(typ, to=self.getFrom(), frm=self.getTo(), attrs={'id': self.getID()})
+		if self.getTag('query'):
+			iq.setQueryNS(self.getQueryNS())
 		return iq
 
 class ErrorNode(Node):
-	''' XMPP-style error element.
-		In the case of stanza error should be attached to XMPP stanza.
-		In the case of stream-level errors should be used separately. '''
-	def __init__(self,name,code=None,typ=None,text=None):
-		''' Create new error node object.
-			Mandatory parameter: name - name of error condition.
-			Optional parameters: code, typ, text. Used for backwards compartibility with older jabber protocol.'''
+	"""
+	XMPP-style error element
+
+	In the case of stanza error should be attached to XMPP stanza.
+	In the case of stream-level errors should be used separately.
+	"""
+
+	def __init__(self, name, code=None, typ=None, text=None):
+		"""
+		Mandatory parameter: name - name of error condition.
+		Optional parameters: code, typ, text. Used for backwards compartibility with older jabber protocol.
+		"""
 		if name in ERRORS:
-			cod,type_,txt=ERRORS[name]
-			ns=name.split()[0]
-		else: cod,ns,type_,txt='500',NS_STANZAS,'cancel',''
-		if typ: type_=typ
-		if code: cod=code
-		if text: txt=text
-		Node.__init__(self,'error',{},[Node(name)])
-		if type_: self.setAttr('type',type_)
-		if not cod: self.setName('stream:error')
-		if txt: self.addChild(node=Node(ns+' text',{},[txt]))
-		if cod: self.setAttr('code',cod)
+			cod, type_, txt = ERRORS[name]
+			ns = name.split()[0]
+		else:
+			cod, ns, type_, txt = '500', NS_STANZAS, 'cancel', ''
+		if typ:
+			type_ = typ
+		if code:
+			cod = code
+		if text:
+			txt = text
+		Node.__init__(self,'error', {}, [Node(name)])
+		if type_:
+			self.setAttr('type', type_)
+		if not cod:
+			self.setName('stream:error')
+		if txt:
+			self.addChild(node=Node(ns + ' text', {}, [txt]))
+		if cod:
+			self.setAttr('code', cod)
 
 class Error(Protocol):
-	''' Used to quickly transform received stanza into error reply.'''
-	def __init__(self,node,error,reply=1):
-		''' Create error reply basing on the received 'node' stanza and the 'error' error condition.
-			If the 'node' is not the received stanza but locally created ('to' and 'from' fields needs not swapping)
-			specify the 'reply' argument as false.'''
-		if reply: Protocol.__init__(self,to=node.getFrom(),frm=node.getTo(),node=node)
-		else: Protocol.__init__(self,node=node)
+	"""
+	Used to quickly transform received stanza into error reply
+	"""
+
+	def __init__(self, node, error, reply=1):
+		"""
+		Create error reply basing on the received 'node' stanza and the 'error'
+		error condition
+
+		If the 'node' is not the received stanza but locally created ('to' and
+		'from' fields needs not swapping) specify the 'reply' argument as false.
+		"""
+		if reply:
+			Protocol.__init__(self, to=node.getFrom(), frm=node.getTo(), node=node)
+		else:
+			Protocol.__init__(self, node=node)
 		self.setError(error)
-		if node.getType()=='error': self.__str__=self.__dupstr__
-	def __dupstr__(self,dup1=None,dup2=None):
-		''' Dummy function used as preventor of creating error node in reply to error node.
-			I.e. you will not be able to serialise "double" error into string.
-		'''
+		if node.getType() == 'error':
+			self.__str__ = self.__dupstr__
+
+	def __dupstr__(self, dup1=None, dup2=None):
+		"""
+		Dummy function used as preventor of creating error node in reply to error
+		node. I.e. you will not be able to serialise "double" error into string.
+		"""
 		return ''
 
 class DataField(Node):
-	''' This class is used in the DataForm class to describe the single data item.
-		If you are working with jabber:x:data (XEP-0004, XEP-0068, XEP-0122)
-		then you will need to work with instances of this class. '''
-	def __init__(self,name=None,value=None,typ=None,required=0,desc=None,options=[],node=None):
-		''' Create new data field of specified name,value and type.
-			Also 'required','desc' and 'options' fields can be set.
-			Alternatively other XML object can be passed in as the 'node' parameted to replicate it as a new datafiled.
-			'''
-		Node.__init__(self,'field',node=node)
-		if name: self.setVar(name)
-		if isinstance(value, (list, tuple)): self.setValues(value)
-		elif value: self.setValue(value)
-		if typ: self.setType(typ)
-		elif not typ and not node: self.setType('text-single')
-		if required: self.setRequired(required)
-		if desc: self.setDesc(desc)
-		if options: self.setOptions(options)
-	def setRequired(self,req=1):
-		''' Change the state of the 'required' flag. '''
-		if req: self.setTag('required')
+	"""
+	This class is used in the DataForm class to describe the single data item
+
+	If you are working with jabber:x:data (XEP-0004, XEP-0068, XEP-0122) then
+	you will need to work with instances of this class.
+	"""
+
+	def __init__(self, name=None, value=None, typ=None, required=0, desc=None,
+			options=[], node=None):
+		"""
+		Create new data field of specified name,value and type
+
+		Also 'required','desc' and 'options' fields can be set. Alternatively
+		other XML object can be passed in as the 'node' parameted to replicate it
+		as a new datafiled.
+		"""
+		Node.__init__(self, 'field', node=node)
+		if name:
+			self.setVar(name)
+		if isinstance(value, (list, tuple)):
+			self.setValues(value)
+		elif value:
+			self.setValue(value)
+		if typ:
+			self.setType(typ)
+		elif not typ and not node:
+			self.setType('text-single')
+		if required:
+			self.setRequired(required)
+		if desc:
+			self.setDesc(desc)
+		if options:
+			self.setOptions(options)
+
+	def setRequired(self, req=1):
+		"""
+		Change the state of the 'required' flag
+		"""
+		if req:
+			self.setTag('required')
 		else:
-			try: self.delChild('required')
-			except ValueError: return
+			try:
+				self.delChild('required')
+			except ValueError:
+				return
+
 	def isRequired(self):
-		''' Returns in this field a required one. '''
+		"""
+		Return in this field a required one
+		"""
 		return self.getTag('required')
-	def setDesc(self,desc):
-		''' Set the description of this field. '''
-		self.setTagData('desc',desc)
+
+	def setDesc(self, desc):
+		"""
+		Set the description of this field
+		"""
+		self.setTagData('desc', desc)
+
 	def getDesc(self):
-		''' Return the description of this field. '''
+		"""
+		Return the description of this field
+		"""
 		return self.getTagData('desc')
-	def setValue(self,val):
-		''' Set the value of this field. '''
-		self.setTagData('value',val)
+
+	def setValue(self, val):
+		"""
+		Set the value of this field
+		"""
+		self.setTagData('value', val)
+
 	def getValue(self):
 		return self.getTagData('value')
-	def setValues(self,lst):
-		''' Set the values of this field as values-list.
-			Replaces all previous filed values! If you need to just add a value - use addValue method.'''
-		while self.getTag('value'): self.delChild('value')
-		for val in lst: self.addValue(val)
-	def addValue(self,val):
-		''' Add one more value to this field. Used in 'get' iq's or such.'''
-		self.addChild('value',{},[val])
+
+	def setValues(self, lst):
+		"""
+		Set the values of this field as values-list. Replaces all previous filed
+		values! If you need to just add a value - use addValue method
+		"""
+		while self.getTag('value'):
+			self.delChild('value')
+		for val in lst:
+			self.addValue(val)
+
+	def addValue(self, val):
+		"""
+		Add one more value to this field. Used in 'get' iq's or such
+		"""
+		self.addChild('value', {}, [val])
+
 	def getValues(self):
-		''' Return the list of values associated with this field.'''
-		ret=[]
-		for tag in self.getTags('value'): ret.append(tag.getData())
+		"""
+		Return the list of values associated with this field
+		"""
+		ret = []
+		for tag in self.getTags('value'):
+			ret.append(tag.getData())
 		return ret
+
 	def getOptions(self):
-		''' Return label-option pairs list associated with this field.'''
-		ret=[]
-		for tag in self.getTags('option'): ret.append([tag.getAttr('label'),tag.getTagData('value')])
+		"""
+		Return label-option pairs list associated with this field
+		"""
+		ret = []
+		for tag in self.getTags('option'):
+			ret.append([tag.getAttr('label'), tag.getTagData('value')])
 		return ret
-	def setOptions(self,lst):
-		''' Set label-option pairs list associated with this field.'''
-		while self.getTag('option'): self.delChild('option')
-		for opt in lst: self.addOption(opt)
-	def addOption(self,opt):
-		''' Add one more label-option pair to this field.'''
-		if isinstance(opt, basestring): self.addChild('option').setTagData('value',opt)
-		else: self.addChild('option',{'label':opt[0]}).setTagData('value',opt[1])
+
+	def setOptions(self, lst):
+		"""
+		Set label-option pairs list associated with this field
+		"""
+		while self.getTag('option'):
+			self.delChild('option')
+		for opt in lst:
+			self.addOption(opt)
+
+	def addOption(self, opt):
+		"""
+		Add one more label-option pair to this field
+		"""
+		if isinstance(opt, basestring):
+			self.addChild('option').setTagData('value', opt)
+		else:
+			self.addChild('option', {'label': opt[0]}).setTagData('value', opt[1])
+
 	def getType(self):
-		''' Get type of this field. '''
+		"""
+		Get type of this field
+		"""
 		return self.getAttr('type')
-	def setType(self,val):
-		''' Set type of this field. '''
-		return self.setAttr('type',val)
+
+	def setType(self, val):
+		"""
+		Set type of this field
+		"""
+		return self.setAttr('type', val)
+
 	def getVar(self):
-		''' Get 'var' attribute value of this field. '''
+		"""
+		Get 'var' attribute value of this field
+		"""
 		return self.getAttr('var')
-	def setVar(self,val):
-		''' Set 'var' attribute value of this field. '''
+
+	def setVar(self, val):
+		"""
+		Set 'var' attribute value of this field
+		"""
 		return self.setAttr('var',val)
 
 class DataForm(Node):
-	''' DataForm class. Used for manipulating dataforms in XMPP.
-		Relevant XEPs: 0004, 0068, 0122.
-		Can be used in disco, pub-sub and many other applications.'''
+	"""
+	Used for manipulating dataforms in XMPP
+
+	Relevant XEPs: 0004, 0068, 0122. Can be used in disco, pub-sub and many
+	other applications.
+	"""
 	def __init__(self, typ=None, data=[], title=None, node=None):
-		'''
-			Create new dataform of type 'typ'. 'data' is the list of DataField
-			instances that this dataform contains, 'title' - the title string.
-			You can specify the 'node' argument as the other node to be used as
-			base for constructing this dataform.
-
-			title and instructions is optional and SHOULD NOT contain newlines.
-			Several instructions MAY be present.
-			'typ' can be one of ('form' | 'submit' | 'cancel' | 'result' )
-			'typ' of reply iq can be ( 'result' | 'set' | 'set' | 'result' ) respectively.
-			'cancel' form can not contain any fields. All other forms contains AT LEAST one field.
-			'title' MAY be included in forms of type "form" and "result"
-		'''
-		Node.__init__(self,'x',node=node)
+		"""
+		Create new dataform of type 'typ'. 'data' is the list of DataField
+		instances that this dataform contains, 'title' - the title string.  You
+		can specify the 'node' argument as the other node to be used as base for
+		constructing this dataform
+
+		title and instructions is optional and SHOULD NOT contain newlines.
+		Several instructions MAY be present.
+		'typ' can be one of ('form' | 'submit' | 'cancel' | 'result' )
+		'typ' of reply iq can be ( 'result' | 'set' | 'set' | 'result' ) respectively.
+		'cancel' form can not contain any fields. All other forms contains AT LEAST one field.
+		'title' MAY be included in forms of type "form" and "result"
+		"""
+		Node.__init__(self, 'x', node=node)
 		if node:
-			newkids=[]
+			newkids = []
 			for n in self.getChildren():
-				if n.getName()=='field': newkids.append(DataField(node=n))
-				else: newkids.append(n)
-			self.kids=newkids
-		if typ: self.setType(typ)
+				if n.getName() == 'field':
+					newkids.append(DataField(node=n))
+				else:
+					newkids.append(n)
+			self.kids = newkids
+		if typ:
+			self.setType(typ)
 		self.setNamespace(NS_DATA)
-		if title: self.setTitle(title)
+		if title:
+			self.setTitle(title)
 		if isinstance(data, dict):
-			newdata=[]
-			for name in data.keys(): newdata.append(DataField(name,data[name]))
-			data=newdata
+			newdata = []
+			for name in data.keys():
+				newdata.append(DataField(name, data[name]))
+			data = newdata
 		for child in data:
-			if isinstance(child, basestring): self.addInstructions(child)
-			elif child.__class__.__name__=='DataField': self.kids.append(child)
-			else: self.kids.append(DataField(node=child))
+			if isinstance(child, basestring):
+				self.addInstructions(child)
+			elif child.__class__.__name__ == 'DataField':
+				self.kids.append(child)
+			else:
+				self.kids.append(DataField(node=child))
+
 	def getType(self):
-		''' Return the type of dataform. '''
+		"""
+		Return the type of dataform
+		"""
 		return self.getAttr('type')
-	def setType(self,typ):
-		''' Set the type of dataform. '''
-		self.setAttr('type',typ)
+
+	def setType(self, typ):
+		"""
+		Set the type of dataform
+		"""
+		self.setAttr('type', typ)
+
 	def getTitle(self):
-		''' Return the title of dataform. '''
+		"""
+		Return the title of dataform
+		"""
 		return self.getTagData('title')
-	def setTitle(self,text):
-		''' Set the title of dataform. '''
-		self.setTagData('title',text)
+
+	def setTitle(self, text):
+		"""
+		Set the title of dataform
+		"""
+		self.setTagData('title', text)
+
 	def getInstructions(self):
-		''' Return the instructions of dataform. '''
+		"""
+		Return the instructions of dataform
+		"""
 		return self.getTagData('instructions')
-	def setInstructions(self,text):
-		''' Set the instructions of dataform. '''
-		self.setTagData('instructions',text)
-	def addInstructions(self,text):
-		''' Add one more instruction to the dataform. '''
-		self.addChild('instructions',{},[text])
-	def getField(self,name):
-		''' Return the datafield object with name 'name' (if exists). '''
-		return self.getTag('field',attrs={'var':name})
-	def setField(self,name):
-		''' Create if nessessary or get the existing datafield object with name 'name' and return it. '''
-		f=self.getField(name)
-		if f: return f
+
+	def setInstructions(self, text):
+		"""
+		Set the instructions of dataform
+		"""
+		self.setTagData('instructions', text)
+
+	def addInstructions(self, text):
+		"""
+		Add one more instruction to the dataform
+		"""
+		self.addChild('instructions', {}, [text])
+
+	def getField(self, name):
+		"""
+		Return the datafield object with name 'name' (if exists)
+		"""
+		return self.getTag('field', attrs={'var': name})
+
+	def setField(self, name):
+		"""
+		Create if nessessary or get the existing datafield object with name
+		'name' and return it
+		"""
+		f = self.getField(name)
+		if f:
+			return f
 		return self.addChild(node=DataField(name))
+
 	def asDict(self):
-		''' Represent dataform as simple dictionary mapping of datafield names to their values.'''
-		ret={}
+		"""
+		Represent dataform as simple dictionary mapping of datafield names to
+		their values
+		"""
+		ret = {}
 		for field in self.getTags('field'):
-			name=field.getAttr('var')
-			typ=field.getType()
+			name = field.getAttr('var')
+			typ = field.getType()
 			if isinstance(typ, basestring) and typ.endswith('-multi'):
-				val=[]
-				for i in field.getTags('value'): val.append(i.getData())
-			else: val=field.getTagData('value')
-			ret[name]=val
-		if self.getTag('instructions'): ret['instructions']=self.getInstructions()
+				val = []
+				for i in field.getTags('value'):
+					val.append(i.getData())
+			else:
+				val = field.getTagData('value')
+			ret[name] = val
+		if self.getTag('instructions'):
+			ret['instructions'] = self.getInstructions()
 		return ret
-	def __getitem__(self,name):
-		''' Simple dictionary interface for getting datafields values by their names.'''
-		item=self.getField(name)
-		if item: return item.getValue()
+
+	def __getitem__(self, name):
+		"""
+		Simple dictionary interface for getting datafields values by their names
+		"""
+		item = self.getField(name)
+		if item:
+			return item.getValue()
 		raise IndexError('No such field')
-	def __setitem__(self,name,val):
-		''' Simple dictionary interface for setting datafields values by their names.'''
+
+	def __setitem__(self, name, val):
+		"""
+		Simple dictionary interface for setting datafields values by their names
+		"""
 		return self.setField(name).setValue(val)
 
 # vim: se ts=3:
diff --git a/src/common/xmpp/proxy_connectors.py b/src/common/xmpp/proxy_connectors.py
index e4fb4dbd8..b4e7acfcd 100644
--- a/src/common/xmpp/proxy_connectors.py
+++ b/src/common/xmpp/proxy_connectors.py
@@ -14,27 +14,30 @@
 ##   but WITHOUT ANY WARRANTY; without even the implied warranty of
 ##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ##   GNU General Public License for more details.
-'''
-Module containing classes for proxy connecting. So far its HTTP CONNECT
-and SOCKS5 proxy.
+
+"""
+Module containing classes for proxy connecting. So far its HTTP CONNECT and
+SOCKS5 proxy
+
 Authentication to NTLM (Microsoft implementation) proxies can be next.
-'''
+"""
 
 import struct, socket, base64
 import logging
 log = logging.getLogger('gajim.c.x.proxy_connectors')
 
 class ProxyConnector:
-	'''
+	"""
 	Interface for proxy-connecting object - when tunnneling XMPP over proxies,
-	some connecting process usually has to be done before opening stream.
-	Proxy connectors are used right after TCP connection is estabilished.
-	'''
+	some connecting process usually has to be done before opening stream. Proxy
+	connectors are used right after TCP connection is estabilished
+	"""
+
 	def __init__(self, send_method, onreceive, old_on_receive, on_success,
-		on_failure, xmpp_server, proxy_creds=(None,None)):
-		'''
+			on_failure, xmpp_server, proxy_creds=(None,None)):
+		"""
 		Creates proxy connector, starts connecting immediately and gives control
-		back to transport afterwards.
+		back to transport afterwards
 
 		:param send_method: transport send method
 		:param onreceive: method to set on_receive callbacks
@@ -44,7 +47,7 @@ class ProxyConnector:
 		:param on_failure: called when errors occured while connecting
 		:param xmpp_server: tuple of (hostname, port)
 		:param proxy_creds: tuple of (proxy_user, proxy_credentials)
-		'''
+		"""
 		self.send = send_method
 		self.onreceive = onreceive
 		self.old_on_receive = old_on_receive
@@ -58,12 +61,12 @@ class ProxyConnector:
 
 	@classmethod
 	def get_instance(cls, *args, **kwargs):
-		'''
-		Factory Method for object creation.
+		"""
+		Factory Method for object creation
 
-		Use this instead of directly initializing the class in order to make
-		unit testing much easier.
-		'''
+		Use this instead of directly initializing the class in order to make unit
+		testing much easier.
+		"""
 		return cls(*args, **kwargs)
 
 	def start_connecting(self):
@@ -75,11 +78,11 @@ class ProxyConnector:
 
 class HTTPCONNECTConnector(ProxyConnector):
 	def start_connecting(self):
-		'''
-		Connects to proxy, supplies login and password to it
-		(if were specified while creating instance). Instructs proxy to make
-		connection to the target server.
-		'''
+		"""
+		Connect to a proxy, supply login and password to it (if were specified
+		while creating instance). Instruct proxy to make connection to the target
+		server.
+		"""
 		log.info('Proxy server contacted, performing authentification')
 		connector = ['CONNECT %s:%s HTTP/1.1' % self.xmpp_server,
 			'Proxy-Connection: Keep-Alive',
@@ -115,10 +118,11 @@ class HTTPCONNECTConnector(ProxyConnector):
 
 
 class SOCKS5Connector(ProxyConnector):
-	'''
+	"""
 	SOCKS5 proxy connection class. Allows to use SOCKS5 proxies with
-	(optionally) simple authentication (only USERNAME/PASSWORD auth).
-	'''
+	(optionally) simple authentication (only USERNAME/PASSWORD auth)
+	"""
+
 	def start_connecting(self):
 		log.info('Proxy server contacted, performing authentification')
 		if self.proxy_user and self.proxy_pass:
diff --git a/src/common/xmpp/roster_nb.py b/src/common/xmpp/roster_nb.py
index 715476b9e..f343c8341 100644
--- a/src/common/xmpp/roster_nb.py
+++ b/src/common/xmpp/roster_nb.py
@@ -16,10 +16,11 @@
 
 # $Id: roster.py,v 1.17 2005/05/02 08:38:49 snakeru Exp $
 
-'''
+
+"""
 Simple roster implementation. Can be used though for different tasks like
 mass-renaming of contacts.
-'''
+"""
 
 from protocol import JID, Iq, Presence, Node, NodeProcessed, NS_MUC_USER, NS_ROSTER
 from plugin import PlugIn
@@ -29,15 +30,18 @@ log = logging.getLogger('gajim.c.x.roster_nb')
 
 
 class NonBlockingRoster(PlugIn):
-	''' Defines a plenty of methods that will allow you to manage roster.
-		Also automatically track presences from remote JIDs taking into
-		account that every JID can have multiple resources connected. Does not
-		currently support 'error' presences.
-		You can also use mapping interface for access to the internal representation of
-		contacts in roster.
-		'''
+	"""
+	Defines a plenty of methods that will allow you to manage roster. Also
+	automatically track presences from remote JIDs taking into account that
+	every JID can have multiple resources connected. Does not currently support
+	'error' presences. You can also use mapping interface for access to the
+	internal representation of contacts in roster
+	"""
+
 	def __init__(self, version=''):
-		''' Init internal variables. '''
+		"""
+		Init internal variables
+		"""
 		PlugIn.__init__(self)
 		self.version = version
 		self._data = {}
@@ -45,11 +49,15 @@ class NonBlockingRoster(PlugIn):
 		self._exported_methods=[self.getRoster]
 		self.received_from_server = False
 
-	def Request(self,force=0):
-		''' Request roster from server if it were not yet requested
-			(or if the 'force' argument is set). '''
-		if self.set is None: self.set=0
-		elif not force: return
+	def Request(self, force=0):
+		"""
+		Request roster from server if it were not yet requested (or if the
+		'force' argument is set)
+		"""
+		if self.set is None:
+			self.set = 0
+		elif not force:
+			return
 
 		iq = Iq('get',NS_ROSTER)
 		iq.setTagAttr('query', 'ver', self.version)
@@ -59,9 +67,11 @@ class NonBlockingRoster(PlugIn):
 		log.info('Roster requested from server')
 		return id_
 
-	def RosterIqHandler(self,dis,stanza):
-		''' Subscription tracker. Used internally for setting items state in
-			internal roster representation. '''
+	def RosterIqHandler(self, dis, stanza):
+		"""
+		Subscription tracker. Used internally for setting items state in internal
+		roster representation
+		"""
 		sender = stanza.getAttr('from')
 		if not sender is None and not sender.bareMatch(
 		self._owner.User + '@' + self._owner.Server):
@@ -85,15 +95,19 @@ class NonBlockingRoster(PlugIn):
 				self._data[jid]['subscription']=item.getAttr('subscription')
 				self._data[jid]['groups']=[]
 				if not self._data[jid].has_key('resources'): self._data[jid]['resources']={}
-				for group in item.getTags('group'): self._data[jid]['groups'].append(group.getData())
+				for group in item.getTags('group'):
+					if group.getData() not in self._data[jid]['groups']:
+						self._data[jid]['groups'].append(group.getData())
 		self._data[self._owner.User+'@'+self._owner.Server]={'resources':{},'name':None,'ask':None,'subscription':None,'groups':None,}
 		self.set=1
 		# Looks like we have a workaround
 		# raise NodeProcessed # a MUST. Otherwise you'll get back an <iq type='error'/>
 
-	def PresenceHandler(self,dis,pres):
-		''' Presence tracker. Used internally for setting items' resources state in
-			internal roster representation. '''
+	def PresenceHandler(self, dis, pres):
+		"""
+		Presence tracker. Used internally for setting items' resources state in
+		internal roster representation
+		"""
 		if pres.getTag('x', namespace=NS_MUC_USER):
 			return
 		jid=pres.getFrom()
@@ -118,112 +132,204 @@ class NonBlockingRoster(PlugIn):
 		elif typ=='unavailable' and item['resources'].has_key(jid.getResource()): del item['resources'][jid.getResource()]
 		# Need to handle type='error' also
 
-	def _getItemData(self,jid,dataname):
-		''' Return specific jid's representation in internal format. Used internally. '''
-		jid=jid[:(jid+'/').find('/')]
+	def _getItemData(self, jid, dataname):
+		"""
+		Return specific jid's representation in internal format. Used internally
+		"""
+		jid = jid[:(jid+'/').find('/')]
 		return self._data[jid][dataname]
-	def _getResourceData(self,jid,dataname):
-		''' Return specific jid's resource representation in internal format. Used internally. '''
-		if jid.find('/')+1:
-			jid,resource=jid.split('/',1)
-			if self._data[jid]['resources'].has_key(resource): return self._data[jid]['resources'][resource][dataname]
+
+	def _getResourceData(self, jid, dataname):
+		"""
+		Return specific jid's resource representation in internal format. Used
+		internally
+		"""
+		if jid.find('/') + 1:
+			jid, resource = jid.split('/', 1)
+			if self._data[jid]['resources'].has_key(resource):
+				return self._data[jid]['resources'][resource][dataname]
 		elif self._data[jid]['resources'].keys():
-			lastpri=-129
+			lastpri = -129
 			for r in self._data[jid]['resources'].keys():
-				if int(self._data[jid]['resources'][r]['priority'])>lastpri: resource,lastpri=r,int(self._data[jid]['resources'][r]['priority'])
+				if int(self._data[jid]['resources'][r]['priority']) > lastpri:
+					resource,lastpri=r,int(self._data[jid]['resources'][r]['priority'])
 			return self._data[jid]['resources'][resource][dataname]
-	def delItem(self,jid):
-		''' Delete contact 'jid' from roster.'''
-		self._owner.send(Iq('set',NS_ROSTER,payload=[Node('item',{'jid':jid,'subscription':'remove'})]))
-	def getAsk(self,jid):
-		''' Returns 'ask' value of contact 'jid'.'''
-		return self._getItemData(jid,'ask')
-	def getGroups(self,jid):
-		''' Returns groups list that contact 'jid' belongs to.'''
-		return self._getItemData(jid,'groups')
-	def getName(self,jid):
-		''' Returns name of contact 'jid'.'''
-		return self._getItemData(jid,'name')
-	def getPriority(self,jid):
-		''' Returns priority of contact 'jid'. 'jid' should be a full (not bare) JID.'''
-		return self._getResourceData(jid,'priority')
+
+	def delItem(self, jid):
+		"""
+		Delete contact 'jid' from roster
+		"""
+		self._owner.send(Iq('set', NS_ROSTER, payload=[Node('item', {'jid': jid, 'subscription': 'remove'})]))
+
+	def getAsk(self, jid):
+		"""
+		Return 'ask' value of contact 'jid'
+		"""
+		return self._getItemData(jid, 'ask')
+
+	def getGroups(self, jid):
+		"""
+		Return groups list that contact 'jid' belongs to
+		"""
+		return self._getItemData(jid, 'groups')
+
+	def getName(self, jid):
+		"""
+		Return name of contact 'jid'
+		"""
+		return self._getItemData(jid, 'name')
+
+	def getPriority(self, jid):
+		"""
+		Return priority of contact 'jid'. 'jid' should be a full (not bare) JID
+		"""
+		return self._getResourceData(jid, 'priority')
+
 	def getRawRoster(self):
-		''' Returns roster representation in internal format. '''
+		"""
+		Return roster representation in internal format
+		"""
 		return self._data
-	def getRawItem(self,jid):
-		''' Returns roster item 'jid' representation in internal format. '''
+
+	def getRawItem(self, jid):
+		"""
+		Return roster item 'jid' representation in internal format
+		"""
 		return self._data[jid[:(jid+'/').find('/')]]
+
 	def getShow(self, jid):
-		''' Returns 'show' value of contact 'jid'. 'jid' should be a full (not bare) JID.'''
-		return self._getResourceData(jid,'show')
+		"""
+		Return 'show' value of contact 'jid'. 'jid' should be a full (not bare)
+		JID
+		"""
+		return self._getResourceData(jid, 'show')
+
 	def getStatus(self, jid):
-		''' Returns 'status' value of contact 'jid'. 'jid' should be a full (not bare) JID.'''
-		return self._getResourceData(jid,'status')
-	def getSubscription(self,jid):
-		''' Returns 'subscription' value of contact 'jid'.'''
-		return self._getItemData(jid,'subscription')
-	def getResources(self,jid):
-		''' Returns list of connected resources of contact 'jid'.'''
+		"""
+		Return 'status' value of contact 'jid'. 'jid' should be a full (not bare)
+		JID
+		"""
+		return self._getResourceData(jid, 'status')
+
+	def getSubscription(self, jid):
+		"""
+		Return 'subscription' value of contact 'jid'
+		"""
+		return self._getItemData(jid, 'subscription')
+
+	def getResources(self, jid):
+		"""
+		Return list of connected resources of contact 'jid'
+		"""
 		return self._data[jid[:(jid+'/').find('/')]]['resources'].keys()
-	def setItem(self,jid,name=None,groups=[]):
-		''' Renames contact 'jid' and sets the groups list that it now belongs to.'''
-		iq=Iq('set',NS_ROSTER)
-		query=iq.getTag('query')
-		attrs={'jid':jid}
-		if name: attrs['name']=name
-		item=query.setTag('item',attrs)
-		for group in groups: item.addChild(node=Node('group',payload=[group]))
+
+	def setItem(self, jid, name=None, groups=[]):
+		"""
+		Rename contact 'jid' and sets the groups list that it now belongs to
+		"""
+		iq = Iq('set',NS_ROSTER)
+		query = iq.getTag('query')
+		attrs = {'jid': jid}
+		if name:
+			attrs['name'] = name
+		item = query.setTag('item' ,attrs)
+		for group in groups:
+			item.addChild(node=Node('group', payload=[group]))
 		self._owner.send(iq)
-	def setItemMulti(self,items):
-		''' Renames multiple contacts and sets their group lists.'''
-		iq=Iq('set',NS_ROSTER)
-		query=iq.getTag('query')
+
+	def setItemMulti(self, items):
+		"""
+		Rename multiple contacts and sets their group lists
+		"""
+		iq = Iq('set', NS_ROSTER)
+		query = iq.getTag('query')
 		for i in items:
-			attrs={'jid':i['jid']}
-			if i['name']: attrs['name']=i['name']
-			item=query.setTag('item',attrs)
-			for group in i['groups']: item.addChild(node=Node('group',payload=[group]))
+			attrs = {'jid': i['jid']}
+			if i['name']:
+				attrs['name'] = i['name']
+			item = query.setTag('item', attrs)
+			for group in i['groups']:
+				item.addChild(node=Node('group', payload=[group]))
 		self._owner.send(iq)
+
 	def getItems(self):
-		''' Return list of all [bare] JIDs that the roster is currently tracks.'''
+		"""
+		Return list of all [bare] JIDs that the roster is currently tracks
+		"""
 		return self._data.keys()
+
 	def keys(self):
-		''' Same as getItems. Provided for the sake of dictionary interface.'''
+		"""
+		Same as getItems. Provided for the sake of dictionary interface
+		"""
 		return self._data.keys()
-	def __getitem__(self,item):
-		''' Get the contact in the internal format. Raises KeyError if JID 'item' is not in roster.'''
+
+	def __getitem__(self, item):
+		"""
+		Get the contact in the internal format. Raises KeyError if JID 'item' is
+		not in roster
+		"""
 		return self._data[item]
+
 	def getItem(self,item):
-		''' Get the contact in the internal format (or None if JID 'item' is not in roster).'''
-		if self._data.has_key(item): return self._data[item]
-	def Subscribe(self,jid):
-		''' Send subscription request to JID 'jid'.'''
-		self._owner.send(Presence(jid,'subscribe'))
+		"""
+		Get the contact in the internal format (or None if JID 'item' is not in
+		roster)
+		"""
+		if self._data.has_key(item):
+			return self._data[item]
+
+	def Subscribe(self, jid):
+		"""
+		Send subscription request to JID 'jid'
+		"""
+		self._owner.send(Presence(jid, 'subscribe'))
+
 	def Unsubscribe(self,jid):
-		''' Ask for removing our subscription for JID 'jid'.'''
-		self._owner.send(Presence(jid,'unsubscribe'))
-	def Authorize(self,jid):
-		''' Authorise JID 'jid'. Works only if these JID requested auth previously. '''
-		self._owner.send(Presence(jid,'subscribed'))
-	def Unauthorize(self,jid):
-		''' Unauthorise JID 'jid'. Use for declining authorisation request
-			or for removing existing authorization. '''
-		self._owner.send(Presence(jid,'unsubscribed'))
+		"""
+		Ask for removing our subscription for JID 'jid'
+		"""
+		self._owner.send(Presence(jid, 'unsubscribe'))
+
+	def Authorize(self, jid):
+		"""
+		Authorize JID 'jid'. Works only if these JID requested auth previously
+		"""
+		self._owner.send(Presence(jid, 'subscribed'))
+
+	def Unauthorize(self, jid):
+		"""
+		Unauthorise JID 'jid'. Use for declining authorisation request or for
+		removing existing authorization
+		"""
+		self._owner.send(Presence(jid, 'unsubscribed'))
+
 	def getRaw(self):
-		'''Returns the internal data representation of the roster.'''
+		"""
+		Return the internal data representation of the roster
+		"""
 		return self._data
+
 	def setRaw(self, data):
-		'''Returns the internal data representation of the roster.'''
+		"""
+		Return the internal data representation of the roster
+		"""
 		self._data = data
-		self._data[self._owner.User+'@'+self._owner.Server]={'resources':{},'name':None,'ask':None,'subscription':None,'groups':None,}
-		self.set=1
-	# copypasted methods for roster.py from constructor to here
-
+		self._data[self._owner.User + '@' + self._owner.Server] = {
+				'resources': {},
+				'name': None,
+				'ask': None,
+				'subscription': None,
+				'groups': None
+		}
+		self.set = 1
 
 	def plugin(self, owner, request=1):
-		''' Register presence and subscription trackers in the owner's dispatcher.
-			Also request roster from server if the 'request' argument is set.
-			Used internally.'''
+		"""
+		Register presence and subscription trackers in the owner's dispatcher.
+		Also request roster from server if the 'request' argument is set. Used
+		internally
+		"""
 		self._owner.RegisterHandler('iq', self.RosterIqHandler, 'result', NS_ROSTER, makefirst = 1)
 		self._owner.RegisterHandler('iq', self.RosterIqHandler, 'set', NS_ROSTER)
 		self._owner.RegisterHandler('presence', self.PresenceHandler)
@@ -242,7 +348,9 @@ class NonBlockingRoster(PlugIn):
 		return True
 
 	def getRoster(self, on_ready=None, force=False):
-		''' Requests roster from server if neccessary and returns self. '''
+		"""
+		Request roster from server if neccessary and returns self
+		"""
 		return_self = True
 		if not self.set:
 			self.on_ready = on_ready
diff --git a/src/common/xmpp/simplexml.py b/src/common/xmpp/simplexml.py
index f47142c46..2ace6657a 100644
--- a/src/common/xmpp/simplexml.py
+++ b/src/common/xmpp/simplexml.py
@@ -14,64 +14,96 @@
 
 # $Id: simplexml.py,v 1.27 2005/04/30 07:20:27 snakeru Exp $
 
-'''Simplexml module provides xmpppy library with all needed tools to handle XML nodes and XML streams.
-I'm personally using it in many other separate projects. It is designed to be as standalone as possible.'''
+"""
+Simplexml module provides xmpppy library with all needed tools to handle XML
+nodes and XML streams. I'm personally using it in many other separate
+projects. It is designed to be as standalone as possible
+"""
 
 import xml.parsers.expat
 import logging
 log = logging.getLogger('gajim.c.x.simplexml')
 
 def XMLescape(txt):
-	'''Returns provided string with symbols & < > " replaced by their respective XML entities.'''
+	"""
+	Return provided string with symbols & < > " replaced by their respective XML
+	entities
+	"""
 	# replace also FORM FEED and ESC, because they are not valid XML chars
 	return txt.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace('"', "&quot;").replace(u'\x0C', "").replace(u'\x1B', "")
 
 ENCODING='utf-8'
+
 def ustr(what):
-	'''Converts object "what" to unicode string using it's own __str__ method if accessible or unicode method otherwise.'''
-	if isinstance(what, unicode): return what
-	try: r=what.__str__()
-	except AttributeError: r=str(what)
-	if not isinstance(r, unicode): return unicode(r,ENCODING)
+	"""
+	Converts object "what" to unicode string using it's own __str__ method if
+	accessible or unicode method otherwise
+	"""
+	if isinstance(what, unicode):
+		return what
+	try:
+		r = what.__str__()
+	except AttributeError:
+		r = str(what)
+	if not isinstance(r, unicode):
+		return unicode(r, ENCODING)
 	return r
 
 class Node(object):
-	''' Node class describes syntax of separate XML Node. It have a constructor that permits node creation
-		from set of "namespace name", attributes and payload of text strings and other nodes.
-		It does not natively support building node from text string and uses NodeBuilder class for that purpose.
-		After creation node can be mangled in many ways so it can be completely changed.
-		Also node can be serialised into string in one of two modes: default (where the textual representation
-		of node describes it exactly) and "fancy" - with whitespace added to make indentation and thus make
-		result more readable by human.
-
-		Node class have attribute FORCE_NODE_RECREATION that is defaults to False thus enabling fast node
-		replication from the some other node. The drawback of the fast way is that new node shares some
-		info with the "original" node that is changing the one node may influence the other. Though it is
-		rarely needed (in xmpppy it is never needed at all since I'm usually never using original node after
-		replication (and using replication only to move upwards on the classes tree).
-	'''
-	FORCE_NODE_RECREATION=0
-	def __init__(self, tag=None, attrs={}, payload=[], parent=None, nsp=None, node_built=False, node=None):
-		''' Takes "tag" argument as the name of node (prepended by namespace, if needed and separated from it
-			by a space), attrs dictionary as the set of arguments, payload list as the set of textual strings
-			and child nodes that this node carries within itself and "parent" argument that is another node
-			that this one will be the child of. Also the __init__ can be provided with "node" argument that is
-			either a text string containing exactly one node or another Node instance to begin with. If both
-			"node" and other arguments is provided then the node initially created as replica of "node"
-			provided and then modified to be compliant with other arguments.'''
+	"""
+	Node class describes syntax of separate XML Node. It have a constructor that
+	permits node creation from set of "namespace name", attributes and payload
+	of text strings and other nodes. It does not natively support building node
+	from text string and uses NodeBuilder class for that purpose. After
+	creation node can be mangled in many ways so it can be completely changed.
+	Also node can be serialised into string in one of two modes: default (where
+	the textual representation of node describes it exactly) and "fancy" - with
+	whitespace added to make indentation and thus make result more readable by
+	human.
+
+	Node class have attribute FORCE_NODE_RECREATION that is defaults to False
+	thus enabling fast node replication from the some other node. The drawback
+	of the fast way is that new node shares some info with the "original" node
+	that is changing the one node may influence the other. Though it is rarely
+	needed (in xmpppy it is never needed at all since I'm usually never using
+	original node after replication (and using replication only to move upwards
+	on the classes tree).
+	"""
+
+	FORCE_NODE_RECREATION = 0
+
+	def __init__(self, tag=None, attrs={}, payload=[], parent=None, nsp=None,
+			node_built=False, node=None):
+		"""
+		Takes "tag" argument as the name of node (prepended by namespace, if
+		needed and separated from it by a space), attrs dictionary as the set of
+		arguments, payload list as the set of textual strings and child nodes
+		that this node carries within itself and "parent" argument that is
+		another node that this one will be the child of. Also the __init__ can be
+		provided with "node" argument that is either a text string containing
+		exactly one node or another Node instance to begin with. If both "node"
+		and other arguments is provided then the node initially created as
+		replica of "node" provided and then modified to be compliant with other
+		arguments.
+		"""
 		if node:
 			if self.FORCE_NODE_RECREATION and isinstance(node, Node):
-				node=str(node)
+				node = str(node)
 			if not isinstance(node, Node):
-				node=NodeBuilder(node,self)
+				node = NodeBuilder(node,self)
 				node_built = True
 			else:
-				self.name,self.namespace,self.attrs,self.data,self.kids,self.parent,self.nsd = node.name,node.namespace,{},[],[],node.parent,{}
-				for key  in node.attrs.keys(): self.attrs[key]=node.attrs[key]
-				for data in node.data: self.data.append(data)
-				for kid  in node.kids: self.kids.append(kid)
-				for k,v in node.nsd.items(): self.nsd[k] = v
-		else: self.name,self.namespace,self.attrs,self.data,self.kids,self.parent,self.nsd = 'tag','',{},[],[],None,{}
+				self.name, self.namespace, self.attrs, self.data, self.kids, self.parent, self.nsd = node.name, node.namespace, {}, [], [], node.parent, {}
+				for key in node.attrs.keys():
+					self.attrs[key] = node.attrs[key]
+				for data in node.data:
+					self.data.append(data)
+				for kid in node.kids:
+					self.kids.append(kid)
+				for k,v in node.nsd.items():
+					self.nsd[k] = v
+		else:
+			self.name, self.namespace, self.attrs, self.data, self.kids, self.parent, self.nsd = 'tag', '', {}, [], [], None, {}
 		if parent:
 			self.parent = parent
 		self.nsp_cache = {}
@@ -94,10 +126,12 @@ class Node(object):
 					self.name = tag
 		if isinstance(payload, basestring): payload=[payload]
 		for i in payload:
-			if isinstance(i, Node): self.addChild(node=i)
-			else: self.data.append(ustr(i))
+			if isinstance(i, Node):
+				self.addChild(node=i)
+			else:
+				self.data.append(ustr(i))
 
-	def lookup_nsp(self,pfx=''):
+	def lookup_nsp(self, pfx=''):
 		ns = self.nsd.get(pfx,None)
 		if ns is None:
 			ns = self.nsp_cache.get(pfx,None)
@@ -109,9 +143,11 @@ class Node(object):
 				return 'http://www.gajim.org/xmlns/undeclared'
 		return ns
 
-	def __str__(self,fancy=0):
-		''' Method used to dump node into textual representation.
-			if "fancy" argument is set to True produces indented output for readability.'''
+	def __str__(self, fancy=0):
+		"""
+		Method used to dump node into textual representation. If "fancy" argument
+		is set to True produces indented output for readability
+		"""
 		s = (fancy-1) * 2 * ' ' + "<" + self.name
 		if self.namespace:
 			if not self.parent or self.parent.namespace!=self.namespace:
@@ -142,9 +178,12 @@ class Node(object):
 			s = s + "</" + self.name + ">"
 			if fancy: s = s + "\n"
 		return s
+
 	def addChild(self, name=None, attrs={}, payload=[], namespace=None, node=None):
-		''' If "node" argument is provided, adds it as child node. Else creates new node from
-			the other arguments' values and adds it as well.'''
+		"""
+		If "node" argument is provided, adds it as child node. Else creates new
+		node from the other arguments' values and adds it as well
+		"""
 		if 'xmlns' in attrs:
 			raise AttributeError("Use namespace=x instead of attrs={'xmlns':x}")
 		if node:
@@ -155,196 +194,338 @@ class Node(object):
 			newnode.setNamespace(namespace)
 		self.kids.append(newnode)
 		return newnode
+
 	def addData(self, data):
-		''' Adds some CDATA to node. '''
+		"""
+		Add some CDATA to node
+		"""
 		self.data.append(ustr(data))
+
 	def clearData(self):
-		''' Removes all CDATA from the node. '''
-		self.data=[]
+		"""
+		Remove all CDATA from the node
+		"""
+		self.data = []
+
 	def delAttr(self, key):
-		''' Deletes an attribute "key" '''
+		"""
+		Delete an attribute "key"
+		"""
 		del self.attrs[key]
+
 	def delChild(self, node, attrs={}):
-		''' Deletes the "node" from the node's childs list, if "node" is an instance.
-			Else deletes the first node that have specified name and (optionally) attributes. '''
-		if not isinstance(node, Node): node=self.getTag(node,attrs)
+		"""
+		Delete the "node" from the node's childs list, if "node" is an instance.
+		Else delete the first node that have specified name and (optionally)
+		attributes
+		"""
+		if not isinstance(node, Node):
+			node = self.getTag(node,attrs)
 		self.kids.remove(node)
 		return node
+
 	def getAttrs(self):
-		''' Returns all node's attributes as dictionary. '''
+		"""
+		Return all node's attributes as dictionary
+		"""
 		return self.attrs
+
 	def getAttr(self, key):
-		''' Returns value of specified attribute. '''
+		"""
+		Return value of specified attribute
+		"""
 		return self.attrs.get(key)
+
 	def getChildren(self):
-		''' Returns all node's child nodes as list. '''
+		"""
+		Return all node's child nodes as list
+		"""
 		return self.kids
+
 	def getData(self):
-		''' Returns all node CDATA as string (concatenated). '''
+		"""
+		Return all node CDATA as string (concatenated)
+		"""
 		return ''.join(self.data)
+
 	def getName(self):
-		''' Returns the name of node '''
+		"""
+		Return the name of node
+		"""
 		return self.name
+
 	def getNamespace(self):
-		''' Returns the namespace of node '''
+		"""
+		Return the namespace of node
+		"""
 		return self.namespace
+
 	def getParent(self):
-		''' Returns the parent of node (if present). '''
+		"""
+		Returns the parent of node (if present)
+		"""
 		return self.parent
+
 	def getPayload(self):
-		''' Return the payload of node i.e. list of child nodes and CDATA entries.
-			F.e. for "<node>text1<nodea/><nodeb/> text2</node>" will be returned list:
-			['text1', <nodea instance>, <nodeb instance>, ' text2']. '''
-		ret=[]
+		"""
+		Return the payload of node i.e. list of child nodes and CDATA entries.
+		F.e. for "<node>text1<nodea/><nodeb/> text2</node>" will be returned
+		list: ['text1', <nodea instance>, <nodeb instance>, ' text2']
+		"""
+		ret = []
 		for i in range(len(self.kids)+len(self.data)+1):
 			try:
-				if self.data[i]: ret.append(self.data[i])
-			except IndexError: pass
-			try: ret.append(self.kids[i])
-			except IndexError: pass
+				if self.data[i]:
+					ret.append(self.data[i])
+			except IndexError:
+				pass
+			try:
+				ret.append(self.kids[i])
+			except IndexError:
+				pass
 		return ret
+
 	def getTag(self, name, attrs={}, namespace=None):
-		''' Filters all child nodes using specified arguments as filter.
-			Returns the first found or None if not found. '''
+		"""
+		Filter all child nodes using specified arguments as filter. Return the
+		first found or None if not found
+		"""
 		return self.getTags(name, attrs, namespace, one=1)
-	def getTagAttr(self,tag,attr):
-		''' Returns attribute value of the child with specified name (or None if no such attribute).'''
+
+	def getTagAttr(self, tag, attr):
+		"""
+		Return attribute value of the child with specified name (or None if no
+		such attribute)
+		"""
 		try:
 			return self.getTag(tag).attrs[attr]
 		except:
 			return None
+
 	def getTagData(self,tag):
-		''' Returns cocatenated CDATA of the child with specified name.'''
+		"""
+		Return cocatenated CDATA of the child with specified name
+		"""
 		try:
 			return self.getTag(tag).getData()
 		except Exception:
 			return None
+
 	def getTags(self, name, attrs={}, namespace=None, one=0):
-		''' Filters all child nodes using specified arguments as filter.
-			Returns the list of nodes found. '''
-		nodes=[]
+		"""
+		Filter all child nodes using specified arguments as filter. Returns the
+		list of nodes found
+		"""
+		nodes = []
 		for node in self.kids:
-			if namespace and namespace!=node.getNamespace(): continue
+			if namespace and namespace != node.getNamespace():
+				continue
 			if node.getName() == name:
 				for key in attrs.keys():
-				   if key not in node.attrs or node.attrs[key]!=attrs[key]: break
-				else: nodes.append(node)
-			if one and nodes: return nodes[0]
-		if not one: return nodes
+					if key not in node.attrs or node.attrs[key]!=attrs[key]:
+						break
+				else:
+					nodes.append(node)
+			if one and nodes:
+				return nodes[0]
+		if not one:
+			return nodes
 
 	def iterTags(self, name, attrs={}, namespace=None):
-		''' Iterate over all children using specified arguments as filter. '''
+		"""
+		Iterate over all children using specified arguments as filter
+		"""
 		for node in self.kids:
-			if namespace is not None and namespace!=node.getNamespace(): continue
+			if namespace is not None and namespace != node.getNamespace():
+				continue
 			if node.getName() == name:
 				for key in attrs.keys():
 					if key not in node.attrs or \
-						node.attrs[key]!=attrs[key]: break
+						node.attrs[key]!=attrs[key]:
+							break
 				else:
 					yield node
 
 	def setAttr(self, key, val):
-		''' Sets attribute "key" with the value "val". '''
-		self.attrs[key]=val
+		"""
+		Set attribute "key" with the value "val"
+		"""
+		self.attrs[key] = val
+
 	def setData(self, data):
-		''' Sets node's CDATA to provided string. Resets all previous CDATA!'''
-		self.data=[ustr(data)]
-	def setName(self,val):
-		''' Changes the node name. '''
+		"""
+		Set node's CDATA to provided string. Resets all previous CDATA!
+		"""
+		self.data = [ustr(data)]
+
+	def setName(self, val):
+		"""
+		Change the node name
+		"""
 		self.name = val
+
 	def setNamespace(self, namespace):
-		''' Changes the node namespace. '''
-		self.namespace=namespace
+		"""
+		Changes the node namespace
+		"""
+		self.namespace = namespace
+
 	def setParent(self, node):
-		''' Sets node's parent to "node". WARNING: do not checks if the parent already present
-			and not removes the node from the list of childs of previous parent. '''
+		"""
+		Set node's parent to "node". WARNING: do not checks if the parent already
+		present and not removes the node from the list of childs of previous
+		parent
+		"""
 		self.parent = node
-	def setPayload(self,payload,add=0):
-		''' Sets node payload according to the list specified. WARNING: completely replaces all node's
-			previous content. If you wish just to add child or CDATA - use addData or addChild methods. '''
-		if isinstance(payload, basestring): payload=[payload]
-		if add: self.kids+=payload
-		else: self.kids=payload
+
+	def setPayload(self, payload, add=0):
+		"""
+		Set node payload according to the list specified. WARNING: completely
+		replaces all node's previous content. If you wish just to add child or
+		CDATA - use addData or addChild methods
+		"""
+		if isinstance(payload, basestring):
+			payload = [payload]
+		if add:
+			self.kids += payload
+		else:
+			self.kids = payload
+
 	def setTag(self, name, attrs={}, namespace=None):
-		''' Same as getTag but if the node with specified namespace/attributes not found, creates such
-			node and returns it. '''
-		node=self.getTags(name, attrs, namespace=namespace, one=1)
-		if node: return node
-		else: return self.addChild(name, attrs, namespace=namespace)
-	def setTagAttr(self,tag,attr,val):
-		''' Creates new node (if not already present) with name "tag"
-			and sets it's attribute "attr" to value "val". '''
+		"""
+		Same as getTag but if the node with specified namespace/attributes not
+		found, creates such node and returns it
+		"""
+		node = self.getTags(name, attrs, namespace=namespace, one=1)
+		if node:
+			return node
+		else:
+			return self.addChild(name, attrs, namespace=namespace)
+
+	def setTagAttr(self, tag, attr, val):
+		"""
+		Create new node (if not already present) with name "tag" and set it's
+		attribute "attr" to value "val"
+		"""
 		try:
-			self.getTag(tag).attrs[attr]=val
+			self.getTag(tag).attrs[attr] = val
 		except Exception:
-			self.addChild(tag,attrs={attr:val})
-	def setTagData(self,tag,val,attrs={}):
-		''' Creates new node (if not already present) with name "tag" and (optionally) attributes "attrs"
-			and sets it's CDATA to string "val". '''
+			self.addChild(tag, attrs={attr: val})
+
+	def setTagData(self, tag, val, attrs={}):
+		"""
+		Creates new node (if not already present) with name "tag" and
+		(optionally) attributes "attrs" and sets it's CDATA to string "val"
+		"""
 		try:
 			self.getTag(tag,attrs).setData(ustr(val))
 		except Exception:
-			self.addChild(tag,attrs,payload=[ustr(val)])
-	def has_attr(self,key):
-		''' Checks if node have attribute "key".'''
+			self.addChild(tag,attrs,payload = [ustr(val)])
+
+	def has_attr(self, key):
+		"""
+		Check if node have attribute "key"
+		"""
 		return key in self.attrs
-	def __getitem__(self,item):
-		''' Returns node's attribute "item" value. '''
+
+	def __getitem__(self, item):
+		"""
+		Return node's attribute "item" value
+		"""
 		return self.getAttr(item)
-	def __setitem__(self,item,val):
-		''' Sets node's attribute "item" value. '''
-		return self.setAttr(item,val)
-	def __delitem__(self,item):
-		''' Deletes node's attribute "item". '''
+
+	def __setitem__(self, item, val):
+		"""
+		Set node's attribute "item" value
+		"""
+		return self.setAttr(item, val)
+
+	def __delitem__(self, item):
+		"""
+		Delete node's attribute "item"
+		"""
 		return self.delAttr(item)
-	def __contains__(self,item):
-		""" Checks if node has attribute "item" """
+
+	def __contains__(self, item):
+		"""
+		Check if node has attribute "item"
+		"""
 		return self.has_attr(item)
-	def __getattr__(self,attr):
-		''' Reduce memory usage caused by T/NT classes - use memory only when needed. '''
-		if attr=='T':
-			self.T=T(self)
+
+	def __getattr__(self, attr):
+		"""
+		Reduce memory usage caused by T/NT classes - use memory only when needed
+		"""
+		if attr == 'T':
+			self.T = T(self)
 			return self.T
-		if attr=='NT':
-			self.NT=NT(self)
+		if attr == 'NT':
+			self.NT = NT(self)
 			return self.NT
 		raise AttributeError
 
 class T:
-	''' Auxiliary class used to quick access to node's child nodes. '''
-	def __init__(self,node): self.__dict__['node']=node
-	def __getattr__(self,attr): return self.node.setTag(attr)
-	def __setattr__(self,attr,val):
-		if isinstance(val,Node): Node.__init__(self.node.setTag(attr),node=val)
-		else: return self.node.setTagData(attr,val)
-	def __delattr__(self,attr): return self.node.delChild(attr)
+	"""
+	Auxiliary class used to quick access to node's child nodes
+	"""
+
+	def __init__(self, node):
+		self.__dict__['node'] = node
+
+	def __getattr__(self, attr):
+		return self.node.setTag(attr)
+
+	def __setattr__(self, attr, val):
+		if isinstance(val,Node):
+			Node.__init__(self.node.setTag(attr), node=val)
+		else:
+			return self.node.setTagData(attr, val)
+
+	def __delattr__(self, attr):
+		return self.node.delChild(attr)
 
 class NT(T):
-	''' Auxiliary class used to quick create node's child nodes. '''
-	def __getattr__(self,attr): return self.node.addChild(attr)
-	def __setattr__(self,attr,val):
-		if isinstance(val,Node): self.node.addChild(attr,node=val)
-		else: return self.node.addChild(attr,payload=[val])
+	"""
+	Auxiliary class used to quick create node's child nodes
+	"""
+
+	def __getattr__(self, attr):
+		return self.node.addChild(attr)
+
+	def __setattr__(self, attr, val):
+		if isinstance(val,Node):
+			self.node.addChild(attr,node=val)
+		else:
+			return self.node.addChild(attr, payload=[val])
 
 class NodeBuilder:
-	''' Builds a Node class minidom from data parsed to it. This class used for two purposes:
-		1. Creation an XML Node from a textual representation. F.e. reading a config file. See an XML2Node method.
-		2. Handling an incoming XML stream. This is done by mangling
-		   the __dispatch_depth parameter and redefining the dispatch method.
-		You do not need to use this class directly if you do not designing your own XML handler.'''
-	def __init__(self,data=None,initial_node=None):
-		''' Takes two optional parameters: "data" and "initial_node".
-			By default class initialised with empty Node class instance.
-			Though, if "initial_node" is provided it used as "starting point".
-			You can think about it as of "node upgrade".
-			"data" (if provided) feeded to parser immidiatedly after instance init.
-			'''
+	"""
+	Builds a Node class minidom from data parsed to it. This class used for two
+	purposes:
+		1. Creation an XML Node from a textual representation. F.e. reading a
+			config file. See an XML2Node method.
+		2. Handling an incoming XML stream. This is done by mangling the
+			__dispatch_depth parameter and redefining the dispatch method.
+
+	You do not need to use this class directly if you do not designing your own
+	XML handler
+	"""
+
+	def __init__(self, data=None, initial_node=None):
+		"""
+		Take two optional parameters: "data" and "initial_node"
+
+		By default class initialised with empty Node class instance. Though, if
+		"initial_node" is provided it used as "starting point". You can think
+		about it as of "node upgrade". "data" (if provided) feeded to parser
+		immidiatedly after instance init.
+		"""
 		log.debug("Preparing to handle incoming XML stream.")
 		self._parser = xml.parsers.expat.ParserCreate()
-		self._parser.StartElementHandler       = self.starttag
-		self._parser.EndElementHandler         = self.endtag
+		self._parser.StartElementHandler = self.starttag
+		self._parser.EndElementHandler = self.endtag
 		self._parser.StartNamespaceDeclHandler = self.handle_namespace_start
-		self._parser.CharacterDataHandler    = self.handle_cdata
+		self._parser.CharacterDataHandler = self.handle_cdata
 		self._parser.buffer_text = True
 		self.Parse = self._parser.Parse
 
@@ -369,15 +550,19 @@ class NodeBuilder:
 			self.data_buffer = None
 
 	def destroy(self):
-		''' Method used to allow class instance to be garbage-collected. '''
+		"""
+		Method used to allow class instance to be garbage-collected
+		"""
 		self.check_data_buffer()
-		self._parser.StartElementHandler       = None
-		self._parser.EndElementHandler         = None
-		self._parser.CharacterDataHandler      = None
+		self._parser.StartElementHandler = None
+		self._parser.EndElementHandler = None
+		self._parser.CharacterDataHandler = None
 		self._parser.StartNamespaceDeclHandler = None
 
 	def starttag(self, tag, attrs):
-		'''XML Parser callback. Used internally'''
+		"""
+		XML Parser callback. Used internally
+		"""
 		self.check_data_buffer()
 		self._inc_depth()
 		log.info("STARTTAG.. DEPTH -> %i , tag -> %s, attrs -> %s" % (self.__depth, tag, `attrs`))
@@ -410,8 +595,11 @@ class NodeBuilder:
 		if not self.last_is_data and self._ptr.parent:
 			self._ptr.parent.data.append('')
 		self.last_is_data = 0
+
 	def endtag(self, tag ):
-		'''XML Parser callback. Used internally'''
+		"""
+		XML Parser callback. Used internally
+		"""
 		log.info("DEPTH -> %i , tag -> %s" % (self.__depth, tag))
 		self.check_data_buffer()
 		if self.__depth == self._dispatch_depth:
@@ -439,25 +627,42 @@ class NodeBuilder:
 			self.last_is_data = 1
 
 	def handle_namespace_start(self, prefix, uri):
-		'''XML Parser callback. Used internally'''
+		"""
+		XML Parser callback. Used internally
+		"""
 		self.check_data_buffer()
 
 	def getDom(self):
-		''' Returns just built Node. '''
+		"""
+		Return just built Node
+		"""
 		self.check_data_buffer()
 		return self._mini_dom
-	def dispatch(self,stanza):
-		''' Gets called when the NodeBuilder reaches some level of depth on it's way up with the built
-			node as argument. Can be redefined to convert incoming XML stanzas to program events. '''
-	def stream_header_received(self,ns,tag,attrs):
-		''' Method called when stream just opened. '''
+
+	def dispatch(self, stanza):
+		"""
+		Get called when the NodeBuilder reaches some level of depth on it's way
+		up with the built node as argument. Can be redefined to convert incoming
+		XML stanzas to program events
+		"""
+		pass
+
+	def stream_header_received(self, ns, tag, attrs):
+		"""
+		Method called when stream just opened
+		"""
 		self.check_data_buffer()
+
 	def stream_footer_received(self):
-		''' Method called when stream just closed. '''
+		"""
+		Method called when stream just closed
+		"""
 		self.check_data_buffer()
 
 	def has_received_endtag(self, level=0):
-		''' Return True if at least one end tag was seen (at level) '''
+		"""
+		Return True if at least one end tag was seen (at level)
+		"""
 		return self.__depth <= level and self.__max_depth > level
 
 	def _inc_depth(self):
@@ -470,14 +675,20 @@ class NodeBuilder:
 		self.__depth -= 1
 
 def XML2Node(xml):
-	''' Converts supplied textual string into XML node. Handy f.e. for reading configuration file.
-		Raises xml.parser.expat.parsererror if provided string is not well-formed XML. '''
+	"""
+	Convert supplied textual string into XML node. Handy f.e. for reading
+	configuration file. Raises xml.parser.expat.parsererror if provided string
+	is not well-formed XML
+	"""
 	return NodeBuilder(xml).getDom()
 
 def BadXML2Node(xml):
-	''' Converts supplied textual string into XML node. Survives if xml data is cutted half way round.
-		I.e. "<html>some text <br>some more text". Will raise xml.parser.expat.parsererror on misplaced
-		tags though. F.e. "<b>some text <br>some more text</b>" will not work.'''
+	"""
+	Convert supplied textual string into XML node. Survives if xml data is
+	cutted half way round. I.e. "<html>some text <br>some more text". Will raise
+	xml.parser.expat.parsererror on misplaced tags though. F.e. "<b>some text
+	<br>some more text</b>" will not work
+	"""
 	return NodeBuilder(xml).getDom()
 
 # vim: se ts=3:
diff --git a/src/common/xmpp/stringprepare.py b/src/common/xmpp/stringprepare.py
index 47b1a2d1e..39759a513 100644
--- a/src/common/xmpp/stringprepare.py
+++ b/src/common/xmpp/stringprepare.py
@@ -26,16 +26,26 @@ import unicodedata
 from encodings import idna
 
 class ILookupTable:
-	""" Interface for character lookup classes. """
+	"""
+	Interface for character lookup classes
+	"""
 
 	def lookup(self, c):
-		""" Return whether character is in this table. """
+		"""
+		Return whether character is in this table
+		"""
+		pass
 
 class IMappingTable:
-	""" Interface for character mapping classes. """
+	"""
+	Interface for character mapping classes
+	"""
 
 	def map(self, c):
-		""" Return mapping for character. """
+		"""
+		Return mapping for character
+		"""
+		pass
 
 class LookupTableFromFunction:
 
@@ -75,8 +85,8 @@ class EmptyMappingTable:
 			return c
 
 class Profile:
-	def __init__(self, mappings=[],  normalize=True, prohibiteds=[],
-						check_unassigneds=True, check_bidi=True):
+	def __init__(self, mappings=[], normalize=True, prohibiteds=[],
+			check_unassigneds=True, check_bidi=True):
 		self.mappings = mappings
 		self.normalize = normalize
 		self.prohibiteds = prohibiteds
@@ -140,24 +150,25 @@ class Profile:
 
 
 class NamePrep:
-	""" Implements preparation of internationalized domain names.
+	"""
+	Implements preparation of internationalized domain names
 
-		This class implements preparing internationalized domain names using the
-		rules defined in RFC 3491, section 4 (Conversion operations).
+	This class implements preparing internationalized domain names using the
+	rules defined in RFC 3491, section 4 (Conversion operations).
 
-		We do not perform step 4 since we deal with unicode representations of
-		domain names and do not convert from or to ASCII representations using
-		punycode encoding. When such a conversion is needed, the L{idna} standard
-		library provides the C{ToUnicode()} and C{ToASCII()} functions. Note that
-		L{idna} itself assumes UseSTD3ASCIIRules to be false.
+	We do not perform step 4 since we deal with unicode representations of
+	domain names and do not convert from or to ASCII representations using
+	punycode encoding. When such a conversion is needed, the L{idna} standard
+	library provides the C{ToUnicode()} and C{ToASCII()} functions. Note that
+	L{idna} itself assumes UseSTD3ASCIIRules to be false.
 
-		The following steps are performed by C{prepare()}:
+	The following steps are performed by C{prepare()}:
 
-			* Split the domain name in labels at the dots (RFC 3490, 3.1)
-			* Apply nameprep proper on each label (RFC 3491)
-			* Enforce the restrictions on ASCII characters in host names by
-				assuming STD3ASCIIRules to be true. (STD 3)
-			* Rejoin the labels using the label separator U+002E (full stop).
+		* Split the domain name in labels at the dots (RFC 3490, 3.1)
+		* Apply nameprep proper on each label (RFC 3491)
+		* Enforce the restrictions on ASCII characters in host names by
+			assuming STD3ASCIIRules to be true. (STD 3)
+		* Rejoin the labels using the label separator U+002E (full stop).
 	"""
 
 	# Prohibited characters.
diff --git a/src/common/xmpp/tls_nb.py b/src/common/xmpp/tls_nb.py
index 5ed10728b..8706e7fb7 100644
--- a/src/common/xmpp/tls_nb.py
+++ b/src/common/xmpp/tls_nb.py
@@ -54,13 +54,17 @@ def gattr(obj, attr, default=None):
 
 
 class SSLWrapper:
-	'''
+	"""
 	Abstract SSLWrapper base class
-	'''
+	"""
+
 	class Error(IOError):
-		''' Generic SSL Error Wrapper '''
+		"""
+		Generic SSL Error Wrapper
+		"""
+
 		def __init__(self, sock=None, exc=None, errno=None, strerror=None,
-		peer=None):
+				peer=None):
 			self.parent = IOError
 
 			errno = errno or gattr(exc, 'errno') or exc[0]
@@ -122,7 +126,7 @@ class SSLWrapper:
 		log.debug("%s.__init__ called with %s", self.__class__, sslobj)
 
 	def recv(self, data, flags=None):
-		'''
+		"""
 		Receive wrapper for SSL object
 
 		We can return None out of this function to signal that no data is
@@ -130,16 +134,20 @@ class SSLWrapper:
 		depending on which SSL lib we're using. Unfortunately returning ''
 		can indicate that the socket has been closed, so to be sure, we avoid
 		this by returning None.
-		'''
+		"""
 		raise NotImplementedError
 
 	def send(self, data, flags=None, now=False):
-		''' Send wrapper for SSL object '''
+		"""
+		Send wrapper for SSL object
+		"""
 		raise NotImplementedError
 
 
 class PyOpenSSLWrapper(SSLWrapper):
-	'''Wrapper class for PyOpenSSL's recv() and send() methods'''
+	"""
+	Wrapper class for PyOpenSSL's recv() and send() methods
+	"""
 
 	def __init__(self, *args):
 		self.parent = SSLWrapper
@@ -202,7 +210,9 @@ class PyOpenSSLWrapper(SSLWrapper):
 
 
 class StdlibSSLWrapper(SSLWrapper):
-	'''Wrapper class for Python socket.ssl read() and write() methods'''
+	"""
+	Wrapper class for Python socket.ssl read() and write() methods
+	"""
 
 	def __init__(self, *args):
 		self.parent = SSLWrapper
@@ -230,18 +240,18 @@ class StdlibSSLWrapper(SSLWrapper):
 
 
 class NonBlockingTLS(PlugIn):
-	'''
-	TLS connection used to encrypts already estabilished tcp connection.
+	"""
+	TLS connection used to encrypts already estabilished tcp connection
 
 	Can be plugged into NonBlockingTCP and will make use of StdlibSSLWrapper or
 	PyOpenSSLWrapper.
-	'''
+	"""
 
 	def __init__(self, cacerts, mycerts):
-		'''
+		"""
 		:param cacerts: path to pem file with certificates of known XMPP servers
 		:param mycerts: path to pem file with certificates of user trusted servers
-		'''
+		"""
 		PlugIn.__init__(self)
 		self.cacerts = cacerts
 		self.mycerts = mycerts
@@ -254,10 +264,10 @@ class NonBlockingTLS(PlugIn):
 			"SSL_CB_HANDSHAKE_START": 0x10, "SSL_CB_HANDSHAKE_DONE": 0x20}
 
 	def plugin(self, owner):
-		'''
-		Use to PlugIn TLS into transport and start establishing immediately
-		Returns True if TLS/SSL was established correctly, otherwise False.
-		'''
+		"""
+		Use to PlugIn TLS into transport and start establishing immediately.
+		Returns True if TLS/SSL was established correctly, otherwise False
+		"""
 		log.info('Starting TLS estabilishing')
 		try:
 			res = self._startSSL()
@@ -289,7 +299,9 @@ class NonBlockingTLS(PlugIn):
 			"Unknown"), pkey.type())
 
 	def _startSSL(self):
-		''' Immediatedly switch socket to TLS mode. Used internally.'''
+		"""
+		Immediatedly switch socket to TLS mode. Used internally
+		"""
 		log.debug("_startSSL called")
 
 		if USE_PYOPENSSL:
diff --git a/src/common/xmpp/transports_nb.py b/src/common/xmpp/transports_nb.py
index 704cad170..dfe9870c6 100644
--- a/src/common/xmpp/transports_nb.py
+++ b/src/common/xmpp/transports_nb.py
@@ -15,14 +15,14 @@
 ##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ##   GNU General Public License for more details.
 
-'''
+"""
 Transports are objects responsible for connecting to XMPP server and putting
 data to wrapped sockets in in desired form (SSL, TLS, TCP, for HTTP proxy,
 for SOCKS5 proxy...)
 
 Transports are not aware of XMPP stanzas and only responsible for low-level
 connection handling.
-'''
+"""
 
 from simplexml import ustr
 from plugin import PlugIn
@@ -41,12 +41,12 @@ import logging
 log = logging.getLogger('gajim.c.x.transports_nb')
 
 def urisplit(uri):
-	'''
+	"""
 	Function for splitting URI string to tuple (protocol, host, port, path).
-	e.g. urisplit('http://httpcm.jabber.org:123/webclient') returns
-	('http', 'httpcm.jabber.org', 123, '/webclient')
-	return 443 as default port if proto is https else 80
-	'''
+	e.g. urisplit('http://httpcm.jabber.org:123/webclient') returns ('http',
+	'httpcm.jabber.org', 123, '/webclient') return 443 as default port if proto
+	is https else 80
+	"""
 	splitted =  urlparse.urlsplit(uri)
 	proto, host, path = splitted.scheme, splitted.hostname, splitted.path
 	try:
@@ -72,7 +72,7 @@ def get_proxy_data_from_dict(proxy):
 		# 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']:
+	if proxy.get('useauth', False):
 		proxy_user, proxy_pass = proxy['user'], proxy['pass']
 	return tcp_host, tcp_port, proxy_user, proxy_pass
 
@@ -92,6 +92,7 @@ RECV_BUFSIZE = 32768 # 2x maximum size of ssl packet, should be plenty
 
 DATA_RECEIVED = 'DATA RECEIVED'
 DATA_SENT = 'DATA SENT'
+DATA_ERROR = 'DATA ERROR'
 
 DISCONNECTED = 'DISCONNECTED'
 DISCONNECTING = 'DISCONNECTING'
@@ -101,17 +102,18 @@ CONNECTED = 'CONNECTED'
 STATES = (DISCONNECTED, CONNECTING, PROXY_CONNECTING, CONNECTED, DISCONNECTING)
 
 class NonBlockingTransport(PlugIn):
-	'''
-	Abstract class representing a transport.
+	"""
+	Abstract class representing a transport
 
 	Subclasses CAN have different constructor signature but connect method SHOULD
 	be the same.
-	'''
+	"""
+
 	def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls,
-	certs):
-		'''
+			certs):
+		"""
 		Each trasport class can have different constructor but it has to have at
-		least all the arguments of NonBlockingTransport constructor.
+		least all the arguments of NonBlockingTransport constructor
 
 		:param raise_event: callback for monitoring of sent and received data
 		:param on_disconnect: callback called on disconnection during runtime
@@ -120,7 +122,7 @@ class NonBlockingTransport(PlugIn):
 			TCP connection is done
 		:param certs: tuple of (cacerts, mycerts) see constructor of
 			tls_nb.NonBlockingTLS for more details
-		'''
+		"""
 		PlugIn.__init__(self)
 		self.raise_event = raise_event
 		self.on_disconnect = on_disconnect
@@ -156,14 +158,14 @@ class NonBlockingTransport(PlugIn):
 		self.disconnect(do_callback=False)
 
 	def connect(self, conn_5tuple, on_connect, on_connect_failure):
-		'''
+		"""
 		Creates and connects transport to server and port defined in conn_5tuple
-		which should be item from list returned from getaddrinfo.
+		which should be item from list returned from getaddrinfo
 
 		:param conn_5tuple: 5-tuple returned from getaddrinfo
 		:param on_connect: callback called on successful connect to the server
 		:param on_connect_failure: callback called on failure when connecting
-		'''
+		"""
 		self.on_connect = on_connect
 		self.on_connect_failure = on_connect_failure
 		self.server, self.port = conn_5tuple[4][:2]
@@ -177,14 +179,18 @@ class NonBlockingTransport(PlugIn):
 		return self.state
 
 	def _on_connect(self):
-		''' preceeds call of on_connect callback '''
+		"""
+		Preceeds call of on_connect callback
+		"""
 		# data is reference to socket wrapper instance. We don't need it in client
 		# because
 		self.set_state(CONNECTED)
 		self.on_connect()
 
 	def _on_connect_failure(self, err_message):
-		''' preceeds call of on_connect_failure callback '''
+		"""
+		Preceeds call of on_connect_failure callback
+		"""
 		# In case of error while connecting we need to disconnect transport
 		# but we don't want to call DisconnectHandlers from client,
 		# thus the do_callback=False
@@ -203,15 +209,16 @@ class NonBlockingTransport(PlugIn):
 			self.on_disconnect()
 
 	def onreceive(self, recv_handler):
-		'''
-		Sets the on_receive callback.
+		"""
+		Set the on_receive callback.
 
 		onreceive(None) sets callback to Dispatcher.ProcessNonBlocking which is
 		the default one that will decide what to do with received stanza based on
 		its tag name and namespace.
 
-		Do not confuse it with on_receive() method, which is the callback itself.
-		'''
+		Do not confuse it with on_receive() method, which is the callback
+		itself.
+		"""
 		if not recv_handler:
 			if hasattr(self, '_owner') and hasattr(self._owner, 'Dispatcher'):
 				self.on_receive = self._owner.Dispatcher.ProcessNonBlocking
@@ -225,13 +232,17 @@ class NonBlockingTransport(PlugIn):
 		self.set_state(CONNECTING)
 
 	def read_timeout(self):
-		''' called when there's no response from server in defined timeout '''
+		"""
+		Called when there's no response from server in defined timeout
+		"""
 		if self.on_timeout:
 			self.on_timeout()
 		self.renew_send_timeout()
 
 	def read_timeout2(self):
-		''' called when there's no response from server in defined timeout '''
+		"""
+		called when there's no response from server in defined timeout
+		"""
 		if self.on_timeout2:
 			self.on_timeout2()
 		self.renew_send_timeout2()
@@ -276,17 +287,17 @@ class NonBlockingTransport(PlugIn):
 
 
 class NonBlockingTCP(NonBlockingTransport, IdleObject):
-	'''
-	Non-blocking TCP socket wrapper.
+	"""
+	Non-blocking TCP socket wrapper
 
 	It is used for simple XMPP connection. Can be connected via proxy and can
 	estabilish TLS connection.
-	'''
+	"""
 	def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls,
-	certs, proxy_dict=None):
-		'''
+			certs, proxy_dict=None):
+		"""
 		:param proxy_dict: dictionary with proxy data as loaded from config file
-		'''
+		"""
 		NonBlockingTransport.__init__(self, raise_event, on_disconnect, idlequeue,
 			estabilish_tls, certs)
 		IdleObject.__init__(self)
@@ -370,10 +381,10 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 			proxy_creds=self.proxy_dict['credentials'])
 
 	def _on_connect(self):
-		'''
-		Preceeds invoking of on_connect callback. TCP connection is already
-		estabilished by this time.
-		'''
+		"""
+		Preceed invoking of on_connect callback. TCP connection is already
+		estabilished by this time
+		"""
 		if self.estabilish_tls:
 			self.tls_init(
 				on_succ = lambda: NonBlockingTransport._on_connect(self),
@@ -383,10 +394,10 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 			NonBlockingTransport._on_connect(self)
 
 	def tls_init(self, on_succ, on_fail):
-		'''
+		"""
 		Estabilishes TLS/SSL using this TCP connection by plugging a
 		NonBlockingTLS module
-		'''
+		"""
 		cacerts, mycerts = self.certs
 		result = tls_nb.NonBlockingTLS.get_instance(cacerts, mycerts).PlugIn(self)
 		if result:
@@ -395,12 +406,16 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 			on_fail()
 
 	def pollin(self):
-		'''called by idlequeu when receive on plugged socket is possible '''
+		"""
+		Called by idlequeu when receive on plugged socket is possible
+		"""
 		log.info('pollin called, state == %s' % self.get_state())
 		self._do_receive()
 
 	def pollout(self):
-		'''called by idlequeu when send to plugged socket is possible'''
+		"""
+		Called by idlequeu when send to plugged socket is possible
+		"""
 		log.info('pollout called, state == %s' % self.get_state())
 
 		if self.get_state() == CONNECTING:
@@ -416,7 +431,9 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 			self._do_send()
 
 	def pollend(self):
-		'''called by idlequeue on TCP connection errors'''
+		"""
+		Called by idlequeue on TCP connection errors
+		"""
 		log.info('pollend called, state == %s' % self.get_state())
 
 		if self.get_state() == CONNECTING:
@@ -464,10 +481,10 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 			log.warn('remove_timeout: no self.fd state is %s' % self.get_state())
 
 	def send(self, raw_data, now=False):
-		'''
-		Append raw_data to the queue of messages to be send.
-		If supplied data is unicode string, encode it to utf-8.
-		'''
+		"""
+		Append raw_data to the queue of messages to be send. If supplied data is
+		unicode string, encode it to utf-8.
+		"""
 		NonBlockingTransport.send(self, raw_data, now)
 
 		r = self.encode_stanza(raw_data)
@@ -481,7 +498,9 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 		self._plug_idle(writable=True, readable=True)
 
 	def encode_stanza(self, stanza):
-		''' Encode str or unicode to utf-8 '''
+		"""
+		Encode str or unicode to utf-8
+		"""
 		if isinstance(stanza, unicode):
 			stanza = stanza.encode('utf-8')
 		elif not isinstance(stanza, str):
@@ -489,8 +508,8 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 		return stanza
 
 	def _plug_idle(self, writable, readable):
-		'''
-		Plugs file descriptor of socket to Idlequeue.
+		"""
+		Plug file descriptor of socket to Idlequeue
 
 		Plugged socket will be watched for "send possible" or/and "recv possible"
 		events. pollin() callback is invoked on "recv possible", pollout() on
@@ -498,15 +517,15 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 
 		Plugged socket will always be watched for "error" event - in that case,
 		pollend() is called.
-		'''
+		"""
 		log.info('Plugging fd %d, W:%s, R:%s' % (self.fd, writable, readable))
 		self.idlequeue.plug_idle(self, writable, readable)
 
 	def _do_send(self):
-		'''
+		"""
 		Called when send() to connected socket is possible. First message from
-		sendqueue will be sent.
-		'''
+		sendqueue will be sent
+		"""
 		if not self.sendbuff:
 			if not self.sendqueue:
 				log.warn('calling send on empty buffer and queue')
@@ -529,10 +548,10 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 			self.disconnect()
 
 	def _do_receive(self):
-		'''
+		"""
 		Reads all pending incoming data. Will call owner's disconnected() method
-		if appropriate.
-		'''
+		if appropriate
+		"""
 		received = None
 		errnum = 0
 		errstr = 'No Error Set'
@@ -587,27 +606,29 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
 			self.disconnect()
 
 	def _on_receive(self, data):
-		''' preceeds on_receive callback. It peels off and checks HTTP headers in
-		HTTP classes, in here it just calls the callback.'''
+		"""
+		Preceeds on_receive callback. It peels off and checks HTTP headers in
+		HTTP classes, in here it just calls the callback
+		"""
 		self.on_receive(data)
 
 
 class NonBlockingHTTP(NonBlockingTCP):
-	'''
-	Socket wrapper that creates HTTP message out of sent data and peels-off
-	HTTP headers from incoming messages.
-	'''
+	"""
+	Socket wrapper that creates HTTP message out of sent data and peels-off HTTP
+	headers from incoming messages
+	"""
 
 	def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls,
-	certs, on_http_request_possible, on_persistent_fallback, http_dict,
-	proxy_dict=None):
-		'''
+			certs, on_http_request_possible, on_persistent_fallback, http_dict,
+			proxy_dict=None):
+		"""
 		:param on_http_request_possible: method to call when HTTP request to
 			socket owned by transport is possible.
 		:param on_persistent_fallback: callback called when server ends TCP
 			connection. It doesn't have to be fatal for HTTP session.
 		:param http_dict: dictionary with data for HTTP request and headers
-		'''
+		"""
 		NonBlockingTCP.__init__(self, raise_event, on_disconnect, idlequeue,
 			estabilish_tls, certs, proxy_dict)
 
@@ -638,10 +659,10 @@ class NonBlockingHTTP(NonBlockingTCP):
 		self.send(self.build_http_message(raw_data), now)
 
 	def _on_receive(self, data):
-		'''
+		"""
 		Preceeds passing received data to owner class. Gets rid of HTTP headers
 		and checks them.
-		'''
+		"""
 		if self.get_state() == PROXY_CONNECTING:
 			NonBlockingTCP._on_receive(self, data)
 			return
@@ -650,7 +671,7 @@ class NonBlockingHTTP(NonBlockingTCP):
 		self.recvbuff = '%s%s' % (self.recvbuff or '', data)
 		statusline, headers, httpbody, buffer_rest = self.parse_http_message(
 			self.recvbuff)
-		
+
 		if not (statusline and headers and httpbody):
 			log.debug('Received incomplete HTTP response')
 			return
@@ -662,12 +683,12 @@ class NonBlockingHTTP(NonBlockingTCP):
 		self.expected_length = int(headers['Content-Length'])
 		if 'Connection' in headers and headers['Connection'].strip()=='close':
 			self.close_current_connection = True
-			
+
 		if self.expected_length > len(httpbody):
 			# If we haven't received the whole HTTP mess yet, let's end the thread.
 			# It will be finnished from one of following recvs on plugged socket.
-			log.info('not enough bytes in HTTP response - %d expected, %d got' %
-				(self.expected_length, len(self.recvbuff)))
+			log.info('not enough bytes in HTTP response - %d expected, got %d' %
+				(self.expected_length, len(httpbody)))
 		else:
 			# First part of buffer has been extraced and is going to be handled,
 			# remove it from buffer
@@ -685,10 +706,10 @@ class NonBlockingHTTP(NonBlockingTCP):
 			self.on_http_request_possible()
 
 	def build_http_message(self, httpbody, method='POST'):
-		'''
-		Builds http message with given body.
-		Values for headers and status line fields are taken from class variables.
-		'''
+		"""
+		Builds http message with given body. Values for headers and status line
+		fields are taken from class variables
+		"""
 		absolute_uri = '%s://%s:%s%s' % (self.http_protocol, self.http_host,
 			self.http_port, self.http_path)
 		headers = ['%s %s %s' % (method, absolute_uri, self.http_version),
@@ -710,15 +731,16 @@ class NonBlockingHTTP(NonBlockingTCP):
 		return('%s%s' % (headers, httpbody))
 
 	def parse_http_message(self, message):
-		'''
-		splits http message to tuple:
+		"""
+		Split http message into a tuple:
 			(statusline - list of e.g. ['HTTP/1.1', '200', 'OK'],
 			headers - dictionary of headers e.g. {'Content-Length': '604',
 				'Content-Type': 'text/xml; charset=utf-8'},
 			httpbody - string with http body)
 			http_rest - what is left in the message after a full HTTP header + body
-		'''
+		"""
 		message = message.replace('\r','')
+		message = message.lstrip('\n')
 		splitted = message.split('\n\n')
 		if len(splitted) < 2:
 			# no complete http message. Keep filling the buffer until we find one
@@ -726,9 +748,6 @@ class NonBlockingHTTP(NonBlockingTCP):
 			return ('', '', '', buffer_rest)
 		else:
 			(header, httpbody)  = splitted[:2]
-			if httpbody.endswith('\n'):
-				httpbody = httpbody[:-1]
-			buffer_rest = "\n\n".join(splitted[2:])
 			header = header.split('\n')
 			statusline = header[0].split(' ', 2)
 			header = header[1:]
@@ -736,14 +755,20 @@ class NonBlockingHTTP(NonBlockingTCP):
 			for dummy in header:
 				row = dummy.split(' ', 1)
 				headers[row[0][:-1]] = row[1]
+			body_size = headers['Content-Length']
+			rest_splitted = splitted[2:]
+			while (len(httpbody) < body_size) and rest_splitted:
+				# Complete httpbody until it has the announced size
+				httpbody = '\n\n'.join([httpbody, rest_splitted.pop(0)])
+			buffer_rest = "\n\n".join(rest_splitted)
 			return (statusline, headers, httpbody, buffer_rest)
 
 
 class NonBlockingHTTPBOSH(NonBlockingHTTP):
-	'''
-	Class for BOSH HTTP connections. Slightly redefines HTTP transport by calling
-	bosh bodytag generating callback before putting data on wire.
-	'''
+	"""
+	Class for BOSH HTTP connections. Slightly redefines HTTP transport by
+	calling bosh bodytag generating callback before putting data on wire
+	"""
 
 	def set_stanza_build_cb(self, build_cb):
 		self.build_cb = build_cb
diff --git a/src/common/zeroconf/client_zeroconf.py b/src/common/zeroconf/client_zeroconf.py
index 730eb3ec3..96cbd7436 100644
--- a/src/common/zeroconf/client_zeroconf.py
+++ b/src/common/zeroconf/client_zeroconf.py
@@ -23,7 +23,7 @@ from common.xmpp.idlequeue import IdleObject
 from common.xmpp import dispatcher_nb, simplexml
 from common.xmpp.plugin import *
 from common.xmpp.simplexml import ustr
-from common.xmpp.transports_nb import DATA_RECEIVED, DATA_SENT
+from common.xmpp.transports_nb import DATA_RECEIVED, DATA_SENT, DATA_ERROR
 from common.zeroconf import zeroconf
 
 from common.xmpp.protocol import *
@@ -47,7 +47,9 @@ ACTIVITY_TIMEOUT_SECONDS = 30
 
 class ZeroconfListener(IdleObject):
 	def __init__(self, port, conn_holder):
-		''' handle all incomming connections on ('0.0.0.0', port)'''
+		"""
+		Handle all incomming connections on ('0.0.0.0', port)
+		"""
 		self.port = port
 		self.queue_idx = -1
 		#~ self.queue = None
@@ -80,11 +82,15 @@ class ZeroconfListener(IdleObject):
 		self.started = True
 
 	def pollend(self):
-		''' called when we stop listening on (host, port) '''
+		"""
+		Called when we stop listening on (host, port)
+		"""
 		self.disconnect()
 
 	def pollin(self):
-		''' accept a new incomming connection and notify queue'''
+		"""
+		Accept a new incomming connection and notify queue
+		"""
 		sock = self.accept_conn()
 		# loop through roster to find who has connected to us
 		from_jid = None
@@ -97,7 +103,9 @@ class ZeroconfListener(IdleObject):
 		P2PClient(sock[0], ipaddr, sock[1][1], self.conn_holder, [], from_jid)
 
 	def disconnect(self, message=''):
-		''' free all resources, we are not listening anymore '''
+		"""
+		Free all resources, we are not listening anymore
+		"""
 		log.info('Disconnecting ZeroconfListener: %s' % message)
 		gajim.idlequeue.remove_timeout(self.fd)
 		gajim.idlequeue.unplug_idle(self.fd)
@@ -110,14 +118,16 @@ class ZeroconfListener(IdleObject):
 		self.conn_holder.kill_all_connections()
 
 	def accept_conn(self):
-		''' accepts a new incoming connection '''
+		"""
+		Accept a new incoming connection
+		"""
 		_sock = self._serv.accept()
 		_sock[0].setblocking(False)
 		return _sock
 
 class P2PClient(IdleObject):
 	def __init__(self, _sock, host, port, conn_holder, stanzaqueue=[], to=None,
-	on_ok=None, on_not_ok=None):
+			on_ok=None, on_not_ok=None):
 		self._owner = self
 		self.Namespace = 'jabber:client'
 		self.protocol_type = 'XMPP'
@@ -207,7 +217,9 @@ class P2PClient(IdleObject):
 		self._register_handlers()
 
 	def StreamInit(self):
-		''' Send an initial stream header. '''
+		"""
+		Send an initial stream header
+		"""
 		self.Dispatcher.Stream = simplexml.NodeBuilder()
 		self.Dispatcher.Stream._dispatch_depth = 2
 		self.Dispatcher.Stream.dispatch = self.Dispatcher.dispatch
@@ -288,6 +300,7 @@ class P2PClient(IdleObject):
 		pass
 
 	def _register_handlers(self):
+		self._caller.peerhost = self.Connection._sock.getsockname()
 		self.RegisterHandler('message', lambda conn, data:self._caller._messageCB(
 			self.Server, conn, data))
 		self.RegisterHandler('iq', self._caller._siSetCB, 'set',
@@ -373,8 +386,10 @@ class P2PConnection(IdleObject, PlugIn):
 		return True
 
 	def plugout(self):
-		'''Disconnect from the remote server and unregister self.disconnected method from
-			the owner's dispatcher.'''
+		"""
+		Disconnect from the remote server and unregister self.disconnected method
+		from the owner's dispatcher
+		"""
 		self.disconnect()
 		self._owner = None
 
@@ -391,10 +406,13 @@ class P2PConnection(IdleObject, PlugIn):
 			self.on_receive = recv_handler
 
 	def send(self, packet, is_message=False, now=False):
-		'''Append stanza to the queue of messages to be send if now is
-		False, else send it instantly.
-		If supplied data is unicode string, encode it to utf-8.
-		'''
+		"""
+		Append stanza to the queue of messages to be send if now is False, else
+		send it instantly
+
+		If supplied data is unicode string, encode it to UTF-8.
+		"""
+		print 'ici'
 		if self.state <= 0:
 			return
 
@@ -416,8 +434,11 @@ class P2PConnection(IdleObject, PlugIn):
 		ids = self.client.conn_holder.ids_of_awaiting_messages
 		if self.fd in ids and len(ids[self.fd]) > 0:
 			for (id_, thread_id) in ids[self.fd]:
-				self._owner.Dispatcher.Event('', DATA_ERROR, (self.client.to,
-					thread_id))
+				if hasattr(self._owner, 'Dispatcher'):
+					self._owner.Dispatcher.Event('', DATA_ERROR, (self.client.to,
+						thread_id))
+				else:
+					self._owner.on_not_ok('conenction timeout')
 			ids[self.fd] = []
 		self.pollend()
 
@@ -454,7 +475,10 @@ class P2PConnection(IdleObject, PlugIn):
 		self.disconnect()
 
 	def pollin(self):
-		''' Reads all pending incoming data. Calls owner's disconnected() method if appropriate.'''
+		"""
+		Reads all pending incoming data. Call owner's disconnected() method if
+		appropriate
+		"""
 		received = ''
 		errnum = 0
 		try:
@@ -495,7 +519,9 @@ class P2PConnection(IdleObject, PlugIn):
 		return True
 
 	def disconnect(self, message=''):
-		''' Closes the socket. '''
+		"""
+		Close the socket
+		"""
 		gajim.idlequeue.remove_timeout(self.fd)
 		gajim.idlequeue.unplug_idle(self.fd)
 		try:
@@ -578,6 +604,8 @@ class ClientZeroconf:
 		self.hash_to_port = {}
 		self.listener = None
 		self.ids_of_awaiting_messages = {}
+		self.disconnect_handlers = []
+		self.disconnecting = False
 
 	def connect(self, show, msg):
 		self.port = self.start_listener(self.caller.port)
@@ -632,6 +660,9 @@ class ClientZeroconf:
 		self.last_msg = msg
 
 	def disconnect(self):
+		# to avoid recursive calls
+		if self.disconnecting:
+			return
 		if self.listener:
 			self.listener.disconnect()
 			self.listener = None
@@ -642,6 +673,14 @@ class ClientZeroconf:
 			self.roster.zeroconf = None
 			self.roster._data = None
 			self.roster = None
+		self.disconnecting = True
+		for i in reversed(self.disconnect_handlers):
+			log.debug('Calling disconnect handler %s' % i)
+			i()
+		self.disconnecting = False
+
+	def start_disconnect(self):
+		self.disconnect()
 
 	def kill_all_connections(self):
 		for connection in self.connections.values():
@@ -720,13 +759,25 @@ class ClientZeroconf:
 		P2PClient(None, item['address'], item['port'], self,
 			[(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok)
 
+	def RegisterDisconnectHandler(self, handler):
+		"""
+		Register handler that will be called on disconnect
+		"""
+		self.disconnect_handlers.append(handler)
+
+	def UnregisterDisconnectHandler(self, handler):
+		"""
+		Unregister handler that is called on disconnect
+		"""
+		self.disconnect_handlers.remove(handler)
+
 	def SendAndWaitForResponse(self, stanza, timeout=None, func=None, args=None):
-		'''
+		"""
 		Send stanza and wait for recipient's response to it. Will call transports
-		on_timeout callback if response is not retrieved in time.
+		on_timeout callback if response is not retrieved in time
 
 		Be aware: Only timeout of latest call of SendAndWait is active.
-		'''
+		"""
 #		if timeout is None:
 #			timeout = DEFAULT_TIMEOUT_SECONDS
 		def on_ok(_waitid):
@@ -747,8 +798,10 @@ class ClientZeroconf:
 		self.send(stanza, on_ok=on_ok)
 
 	def SendAndCallForResponse(self, stanza, func=None, args=None):
-		''' Put stanza on the wire and call back when recipient replies.
-			Additional callback arguments can be specified in args. '''
+		"""
+		Put stanza on the wire and call back when recipient replies. Additional
+		callback arguments can be specified in args.
+		"""
 		self.SendAndWaitForResponse(stanza, 0, func, args)
 
 # vim: se ts=3:
diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/src/common/zeroconf/connection_handlers_zeroconf.py
index 09818be47..0d45379c3 100644
--- a/src/common/zeroconf/connection_handlers_zeroconf.py
+++ b/src/common/zeroconf/connection_handlers_zeroconf.py
@@ -28,13 +28,14 @@ import socket
 
 from calendar import timegm
 
-from common import socks5
 import common.xmpp
 
 from common import helpers
 from common import gajim
 from common.zeroconf import zeroconf
 from common.commands import ConnectionCommands
+from common.pep import ConnectionPEP
+from common.protocol.bytestream import ConnectionBytestreamZeroconf
 
 import logging
 log = logging.getLogger('gajim.c.z.connection_handlers_zeroconf')
@@ -57,10 +58,10 @@ from session import ChatControlSession
 
 class ConnectionVcard(connection_handlers.ConnectionVcard):
 	def add_sha(self, p, send_caps = True):
-		pass
+		return p
 
 	def add_caps(self, p):
-		pass
+		return p
 
 	def request_vcard(self, jid = None, is_fake_jid = False):
 		pass
@@ -68,318 +69,12 @@ class ConnectionVcard(connection_handlers.ConnectionVcard):
 	def send_vcard(self, vcard):
 		pass
 
-class ConnectionBytestream(connection_handlers.ConnectionBytestream):
-	def send_socks5_info(self, file_props, fast = True, receiver = None,
-		sender = None):
-		''' send iq for the present streamhosts and proxies '''
-		if not isinstance(self.peerhost, tuple):
-			return
-		port = gajim.config.get('file_transfers_port')
-		ft_add_hosts_to_send = gajim.config.get('ft_add_hosts_to_send')
-		if receiver is None:
-			receiver = file_props['receiver']
-		if sender is None:
-			sender = file_props['sender']
-		sha_str = helpers.get_auth_sha(file_props['sid'], sender,
-			receiver)
-		file_props['sha_str'] = sha_str
-		ft_add_hosts = []
-		if ft_add_hosts_to_send:
-			ft_add_hosts_to_send = [e.strip() for e in ft_add_hosts_to_send.split(',')]
-			for ft_host in ft_add_hosts_to_send:
-				try:
-					ft_host = socket.gethostbyname(ft_host)
-					ft_add_hosts.append(ft_host)
-				except socket.gaierror:
-					self.dispatch('ERROR', (_('Wrong host'), _('The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored.') % ft_host))
-		listener = gajim.socks5queue.start_listener(port,
-			sha_str, self._result_socks5_sid, file_props['sid'])
-		if listener is None:
-			file_props['error'] = -5
-			self.dispatch('FILE_REQUEST_ERROR', (unicode(receiver), file_props,
-				''))
-			self._connect_error(unicode(receiver), file_props['sid'],
-				file_props['sid'], code = 406)
-			return
-
-		iq = common.xmpp.Protocol(name = 'iq', to = unicode(receiver),
-			typ = 'set')
-		file_props['request-id'] = 'id_' + file_props['sid']
-		iq.setID(file_props['request-id'])
-		query = iq.setTag('query')
-		query.setNamespace(common.xmpp.NS_BYTESTREAM)
-		query.setAttr('mode', 'tcp')
-		query.setAttr('sid', file_props['sid'])
-		for ft_host in ft_add_hosts:
-			# The streamhost, if set
-			ostreamhost = common.xmpp.Node(tag = 'streamhost')
-			query.addChild(node = ostreamhost)
-			ostreamhost.setAttr('port', unicode(port))
-			ostreamhost.setAttr('host', ft_host)
-			ostreamhost.setAttr('jid', sender)
-		for thehost in self.peerhost:
-			thehost = self.peerhost[0]
-			streamhost = common.xmpp.Node(tag = 'streamhost') # My IP
-			query.addChild(node = streamhost)
-			streamhost.setAttr('port', unicode(port))
-			streamhost.setAttr('host', thehost)
-			streamhost.setAttr('jid', sender)
-		self.connection.send(iq)
-
-	def send_file_request(self, file_props):
-		''' send iq for new FT request '''
-		if not self.connection or self.connected < 2:
-			return
-		our_jid = gajim.get_jid_from_account(self.name)
-		frm = our_jid
-		file_props['sender'] = frm
-		fjid = file_props['receiver'].jid
-		iq = common.xmpp.Protocol(name = 'iq', to = fjid,
-			typ = 'set')
-		iq.setID(file_props['sid'])
-		self.files_props[file_props['sid']] = file_props
-		si = iq.setTag('si')
-		si.setNamespace(common.xmpp.NS_SI)
-		si.setAttr('profile', common.xmpp.NS_FILE)
-		si.setAttr('id', file_props['sid'])
-		file_tag = si.setTag('file')
-		file_tag.setNamespace(common.xmpp.NS_FILE)
-		file_tag.setAttr('name', file_props['name'])
-		file_tag.setAttr('size', file_props['size'])
-		desc = file_tag.setTag('desc')
-		if 'desc' in file_props:
-			desc.setData(file_props['desc'])
-		file_tag.setTag('range')
-		feature = si.setTag('feature')
-		feature.setNamespace(common.xmpp.NS_FEATURE)
-		_feature = common.xmpp.DataForm(typ='form')
-		feature.addChild(node=_feature)
-		field = _feature.setField('stream-method')
-		field.setAttr('type', 'list-single')
-		field.addOption(common.xmpp.NS_BYTESTREAM)
-		self.connection.send(iq)
-
-	def _bytestreamSetCB(self, con, iq_obj):
-		log.debug('_bytestreamSetCB')
-		target = unicode(iq_obj.getAttr('to'))
-		id_ = unicode(iq_obj.getAttr('id'))
-		query = iq_obj.getTag('query')
-		sid = unicode(query.getAttr('sid'))
-		file_props = gajim.socks5queue.get_file_props(
-			self.name, sid)
-		streamhosts=[]
-		for item in query.getChildren():
-			if item.getName() == 'streamhost':
-				host_dict={
-					'state': 0,
-					'target': target,
-					'id': id_,
-					'sid': sid,
-					'initiator': unicode(iq_obj.getFrom())
-				}
-				for attr in item.getAttrs():
-					host_dict[attr] = item.getAttr(attr)
-				streamhosts.append(host_dict)
-		if file_props is None:
-			if sid in self.files_props:
-				file_props = self.files_props[sid]
-				file_props['fast'] = streamhosts
-				if file_props['type'] == 's':
-					if 'streamhosts' in file_props:
-						file_props['streamhosts'].extend(streamhosts)
-					else:
-						file_props['streamhosts'] = streamhosts
-					if not gajim.socks5queue.get_file_props(self.name, sid):
-						gajim.socks5queue.add_file_props(self.name, file_props)
-					gajim.socks5queue.connect_to_hosts(self.name, sid,
-						self.send_success_connect_reply, None)
-				raise common.xmpp.NodeProcessed
-
-		file_props['streamhosts'] = streamhosts
-		if file_props['type'] == 'r':
-			gajim.socks5queue.connect_to_hosts(self.name, sid,
-				self.send_success_connect_reply, self._connect_error)
-		raise common.xmpp.NodeProcessed
-
-	def _ResultCB(self, con, iq_obj):
-		log.debug('_ResultCB')
-		# if we want to respect jep-0065 we have to check for proxy
-		# activation result in any result iq
-		real_id = unicode(iq_obj.getAttr('id'))
-		if not real_id.startswith('au_'):
-			return
-		frm = unicode(iq_obj.getFrom())
-		id_ = real_id[3:]
-		if id_ in self.files_props:
-			file_props = self.files_props[id_]
-			if file_props['streamhost-used']:
-				for host in file_props['proxyhosts']:
-					if host['initiator'] == frm and 'idx' in host:
-						gajim.socks5queue.activate_proxy(host['idx'])
-						raise common.xmpp.NodeProcessed
-
-	def _bytestreamResultCB(self, con, iq_obj):
-		log.debug('_bytestreamResultCB')
-		frm = unicode(iq_obj.getFrom())
-		real_id = unicode(iq_obj.getAttr('id'))
-		query = iq_obj.getTag('query')
-		gajim.proxy65_manager.resolve_result(frm, query)
-
-		try:
-			streamhost =  query.getTag('streamhost-used')
-		except Exception: # this bytestream result is not what we need
-			pass
-		id_ = real_id[3:]
-		if id_ in self.files_props:
-			file_props = self.files_props[id_]
-		else:
-			raise common.xmpp.NodeProcessed
-		if streamhost is None:
-			# proxy approves the activate query
-			if real_id.startswith('au_'):
-				id_ = real_id[3:]
-				if 'streamhost-used' not in file_props or \
-					file_props['streamhost-used'] is False:
-					raise common.xmpp.NodeProcessed
-				if 'proxyhosts' not in file_props:
-					raise common.xmpp.NodeProcessed
-				for host in file_props['proxyhosts']:
-					if host['initiator'] == frm and \
-					unicode(query.getAttr('sid')) == file_props['sid']:
-						gajim.socks5queue.activate_proxy(host['idx'])
-						break
-			raise common.xmpp.NodeProcessed
-		jid = streamhost.getAttr('jid')
-		if 'streamhost-used' in file_props and \
-			file_props['streamhost-used'] is True:
-			raise common.xmpp.NodeProcessed
-
-		if real_id.startswith('au_'):
-			gajim.socks5queue.send_file(file_props, self.name)
-			raise common.xmpp.NodeProcessed
-
-		proxy = None
-		if 'proxyhosts' in file_props:
-			for proxyhost in file_props['proxyhosts']:
-				if proxyhost['jid'] == jid:
-					proxy = proxyhost
-
-		if proxy is not None:
-			file_props['streamhost-used'] = True
-			if 'streamhosts' not in file_props:
-				file_props['streamhosts'] = []
-			file_props['streamhosts'].append(proxy)
-			file_props['is_a_proxy'] = True
-			receiver = socks5.Socks5Receiver(gajim.idlequeue, proxy, file_props['sid'], file_props)
-			gajim.socks5queue.add_receiver(self.name, receiver)
-			proxy['idx'] = receiver.queue_idx
-			gajim.socks5queue.on_success = self._proxy_auth_ok
-			raise common.xmpp.NodeProcessed
-
-		else:
-			gajim.socks5queue.send_file(file_props, self.name)
-			if 'fast' in file_props:
-				fasts = file_props['fast']
-				if len(fasts) > 0:
-					self._connect_error(frm, fasts[0]['id'], file_props['sid'],
-						code = 406)
-
-		raise common.xmpp.NodeProcessed
-
-	def _siResultCB(self, con, iq_obj):
-		log.debug('_siResultCB')
-		self.peerhost = con._owner.Connection._sock.getsockname()
-		id_ = iq_obj.getAttr('id')
-		if id_ not in self.files_props:
-			# no such jid
-			return
-		file_props = self.files_props[id_]
-		if file_props is None:
-			# file properties for jid is none
-			return
-		if 'request-id' in file_props:
-			# we have already sent streamhosts info
-			return
-		file_props['receiver'] = unicode(iq_obj.getFrom())
-		si = iq_obj.getTag('si')
-		file_tag = si.getTag('file')
-		range_tag = None
-		if file_tag:
-			range_tag = file_tag.getTag('range')
-		if range_tag:
-			offset = range_tag.getAttr('offset')
-			if offset:
-				file_props['offset'] = int(offset)
-			length = range_tag.getAttr('length')
-			if length:
-				file_props['length'] = int(length)
-		feature = si.setTag('feature')
-		if feature.getNamespace() != common.xmpp.NS_FEATURE:
-			return
-		form_tag = feature.getTag('x')
-		form = common.xmpp.DataForm(node=form_tag)
-		field = form.getField('stream-method')
-		if field.getValue() != common.xmpp.NS_BYTESTREAM:
-			return
-		self.send_socks5_info(file_props, fast = True)
-		raise common.xmpp.NodeProcessed
-
-	def _siSetCB(self, con, iq_obj):
-		log.debug('_siSetCB')
-		jid = unicode(iq_obj.getFrom())
-		si = iq_obj.getTag('si')
-		profile = si.getAttr('profile')
-		mime_type = si.getAttr('mime-type')
-		if profile != common.xmpp.NS_FILE:
-			return
-		file_tag = si.getTag('file')
-		file_props = {'type': 'r'}
-		for attribute in file_tag.getAttrs():
-			if attribute in ('name', 'size', 'hash', 'date'):
-				val = file_tag.getAttr(attribute)
-				if val is None:
-					continue
-				file_props[attribute] = val
-		file_desc_tag = file_tag.getTag('desc')
-		if file_desc_tag is not None:
-			file_props['desc'] = file_desc_tag.getData()
-
-		if mime_type is not None:
-			file_props['mime-type'] = mime_type
-		our_jid = gajim.get_jid_from_account(self.name)
-		file_props['receiver'] = our_jid
-		file_props['sender'] = unicode(iq_obj.getFrom())
-		file_props['request-id'] = unicode(iq_obj.getAttr('id'))
-		file_props['sid'] = unicode(si.getAttr('id'))
-		file_props['transfered_size'] = []
-		gajim.socks5queue.add_file_props(self.name, file_props)
-		self.dispatch('FILE_REQUEST', (jid, file_props))
-		raise common.xmpp.NodeProcessed
-
-	def _siErrorCB(self, con, iq_obj):
-		log.debug('_siErrorCB')
-		si = iq_obj.getTag('si')
-		profile = si.getAttr('profile')
-		if profile != common.xmpp.NS_FILE:
-			return
-		id_ = iq_obj.getAttr('id')
-		if id_ not in self.files_props:
-			# no such jid
-			return
-		file_props = self.files_props[id_]
-		if file_props is None:
-			# file properties for jid is none
-			return
-		jid = unicode(iq_obj.getFrom())
-		file_props['error'] = -3
-		self.dispatch('FILE_REQUEST_ERROR', (jid, file_props, ''))
-		raise common.xmpp.NodeProcessed
 
-class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream,
-ConnectionCommands, connection_handlers.ConnectionHandlersBase):
+class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestreamZeroconf,
+ConnectionCommands, ConnectionPEP, connection_handlers.ConnectionHandlersBase):
 	def __init__(self):
 		ConnectionVcard.__init__(self)
-		ConnectionBytestream.__init__(self)
+		ConnectionBytestreamZeroconf.__init__(self)
 		ConnectionCommands.__init__(self)
 		connection_handlers.ConnectionHandlersBase.__init__(self)
 
@@ -390,8 +85,9 @@ ConnectionCommands, connection_handlers.ConnectionHandlersBase):
 			HAS_IDLE = False
 
 	def _messageCB(self, ip, con, msg):
-		'''Called when we receive a message'''
-
+		"""
+		Called when we receive a message
+		"""
 		log.debug('Zeroconf MessageCB')
 
 		frm = msg.getFrom()
@@ -470,22 +166,13 @@ ConnectionCommands, connection_handlers.ConnectionHandlersBase):
 	# END messageCB
 
 	def store_metacontacts(self, tags):
-		''' fake empty method '''
+		"""
+		Fake empty method
+		"""
 		# serverside metacontacts are not supported with zeroconf
 		# (there is no server)
 		pass
 
-	def remove_transfers_for_contact(self, contact):
-		''' stop all active transfer for contact '''
-		pass
-
-	def remove_all_transfers(self):
-		''' stops and removes all active connections from the socks5 pool '''
-		pass
-
-	def remove_transfer(self, file_props, remove_from_list = True):
-		pass
-
 	def _DiscoverItemsGetCB(self, con, iq_obj):
 		log.debug('DiscoverItemsGetCB')
 
diff --git a/src/common/zeroconf/connection_zeroconf.py b/src/common/zeroconf/connection_zeroconf.py
index 26c7fbf63..2059e9b82 100644
--- a/src/common/zeroconf/connection_zeroconf.py
+++ b/src/common/zeroconf/connection_zeroconf.py
@@ -5,7 +5,7 @@
 ##	- Nikos Kouremenos <nkour@jabber.org>
 ##	- Dimitur Kirov <dkirov@gmail.com>
 ##	- Travis Shirk <travis@pobox.com>
-##  - Stefan Bethge <stefan@lanpartei.de>
+## - Stefan Bethge <stefan@lanpartei.de>
 ##
 ## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
 ##                         Vincent Hanquez <tab@snarc.org>
@@ -43,147 +43,92 @@ if os.name != 'nt':
 import getpass
 import gobject
 
+from common.connection import CommonConnection
 from common import gajim
 from common import GnuPG
 from common.zeroconf import client_zeroconf
 from common.zeroconf import zeroconf
 from connection_handlers_zeroconf import *
 
-class ConnectionZeroconf(ConnectionHandlersZeroconf):
-	'''Connection class'''
+class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
 	def __init__(self, name):
 		ConnectionHandlersZeroconf.__init__(self)
 		# system username
 		self.username = None
-		self.name = name
 		self.server_resource = '' # zeroconf has no resource, fake an empty one
-		self.connected = 0 # offline
-		self.connection = None
-		self.gpg = None
-		self.USE_GPG = False
-		if gajim.HAVE_GPG:
-			self.USE_GPG = True
-			self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
-		self.is_zeroconf = True
-		self.privacy_rules_supported = False
-		self.blocked_list = []
-		self.blocked_contacts = []
-		self.blocked_groups = []
-		self.blocked_all = False
-		self.status = ''
-		self.old_show = ''
-		self.priority = 0
-
 		self.call_resolve_timeout = False
-
-		self.time_to_reconnect = None
-		#self.new_account_info = None
-		self.bookmarks = []
-
-		#we don't need a password, but must be non-empty
+		# we don't need a password, but must be non-empty
 		self.password = 'zeroconf'
-
 		self.autoconnect = False
-		self.sync_with_global_status = True
-		self.no_log_for = False
-
-		self.pep_supported = False
-		self.mood = {}
-		self.tune = {}
-		self.activity = {}
-		# Do we continue connection when we get roster (send presence,get vcard...)
-		self.continue_connect_info = None
-		if gajim.HAVE_GPG:
-			self.USE_GPG = True
-			self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
 
-		self.get_config_values_or_default()
-
-		self.muc_jid = {} # jid of muc server for each transport type
-		self.vcard_supported = False
-		self.private_storage_supported = False
+		CommonConnection.__init__(self, name)
+		self.is_zeroconf = True
 
 	def get_config_values_or_default(self):
-		''' get name, host, port from config, or
-		create zeroconf account with default values'''
-
+		"""
+		Get name, host, port from config, or create zeroconf account with default
+		values
+		"""
 		if not gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name'):
 			gajim.log.debug('Creating zeroconf account')
 			gajim.config.add_per('accounts', gajim.ZEROCONF_ACC_NAME)
-			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'autoconnect', True)
-			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'no_log_for', '')
-			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'password', 'zeroconf')
-			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'sync_with_global_status', True)
-
-			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port', 5298)
-			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'is_zeroconf', True)
+			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME,
+				'autoconnect', True)
+			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'no_log_for',
+				'')
+			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'password',
+				'zeroconf')
+			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME,
+				'sync_with_global_status', True)
+
+			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME,
+				'custom_port', 5298)
+			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME,
+				'is_zeroconf', True)
+			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME,
+				'use_ft_proxies', False)
 		#XXX make sure host is US-ASCII
 		self.host = unicode(socket.gethostname())
-		gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'hostname', self.host)
-		self.port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port')
-		self.autoconnect = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'autoconnect')
-		self.sync_with_global_status = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'sync_with_global_status')
-		self.no_log_for = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'no_log_for')
-		self.first = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_first_name')
-		self.last = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_last_name')
-		self.jabber_id = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_jabber_id')
-		self.email = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_email')
+		gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'hostname',
+			self.host)
+		self.port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
+			'custom_port')
+		self.autoconnect = gajim.config.get_per('accounts',
+			gajim.ZEROCONF_ACC_NAME, 'autoconnect')
+		self.sync_with_global_status = gajim.config.get_per('accounts',
+			gajim.ZEROCONF_ACC_NAME, 'sync_with_global_status')
+		self.first = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
+			'zeroconf_first_name')
+		self.last = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
+			'zeroconf_last_name')
+		self.jabber_id = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
+			'zeroconf_jabber_id')
+		self.email = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
+			'zeroconf_email')
 
 		if not self.username:
 			self.username = unicode(getpass.getuser())
-			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name', self.username)
+			gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name',
+				self.username)
 		else:
-			self.username = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name')
+			self.username = gajim.config.get_per('accounts',
+				gajim.ZEROCONF_ACC_NAME, 'name')
 	# END __init__
 
-	def dispatch(self, event, data):
-		#gajim.interface.dispatch(event, self.name, data)
-		gajim.ged.raise_event(event, self.name, data)
+	def check_jid(self, jid):
+		return jid
 
 	def _reconnect(self):
 		# Do not try to reco while we are already trying
 		self.time_to_reconnect = None
 		gajim.log.debug('reconnect')
 
-#		signed = self.get_signed_msg(self.status)
 		self.disconnect()
 		self.change_status(self.old_show, self.status)
 
-	def quit(self, kill_core):
-		if kill_core and self.connected > 1:
-			self.disconnect()
-
 	def disable_account(self):
 		self.disconnect()
 
-	def test_gpg_passphrase(self, password):
-		self.gpg.passphrase = password
-		keyID = gajim.config.get_per('accounts', self.name, 'keyid')
-		signed = self.gpg.sign('test', keyID)
-		self.gpg.password = None
-		return signed != 'BAD_PASSPHRASE'
-
-	def get_signed_msg(self, msg):
-		signed = ''
-		keyID = gajim.config.get_per('accounts', self.name, 'keyid')
-		if keyID and self.USE_GPG:
-			use_gpg_agent = gajim.config.get('use_gpg_agent')
-			if self.connected < 2 and self.gpg.passphrase is None and \
-			not use_gpg_agent:
-				# We didn't set a passphrase
-				self.dispatch('ERROR', (_('OpenPGP passphrase was not given'),
-					#%s is the account name here
-					_('You will be connected to %s without OpenPGP.') % self.name))
-				self.USE_GPG = False
-			elif self.gpg.passphrase is not None or use_gpg_agent:
-				signed = self.gpg.sign(msg, keyID)
-				if signed == 'BAD_PASSPHRASE':
-					self.USE_GPG = False
-					signed = ''
-					if self.connected < 2:
-						self.dispatch('BAD_PASSPHRASE', ())
-		return signed
-
 	def _on_resolve_timeout(self):
 		if self.connected:
 			self.connection.resolve_all()
@@ -200,8 +145,10 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 	# callbacks called from zeroconf
 	def _on_new_service(self, jid):
 		self.roster.setItem(jid)
-		self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid)))
-		self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0, None))
+		self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no',
+			self.roster.getGroups(jid)))
+		self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid),
+			self.roster.getMessage(jid), 'local', 0, None, 0, None))
 
 	def _on_remove_service(self, jid):
 		self.roster.delItem(jid)
@@ -209,18 +156,11 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 		# keyID, timestamp, contact_nickname))
 		self.dispatch('NOTIFY', (jid, 'offline', '', 'local', 0, None, 0, None))
 
-	def _on_disconnected(self):
-		self.disconnect()
-		self.dispatch('STATUS', 'offline')
-		self.dispatch('CONNECTION_LOST',
-			(_('Connection with account "%s" has been lost') % self.name,
-			_('To continue sending and receiving messages, you will need to reconnect.')))
-		self.status = 'offline'
-		self.disconnect()
-
 	def _disconnectedReconnCB(self):
-		'''Called when we are disconnected. Comes from network manager for example
-		we don't try to reconnect, network manager will tell us when we can'''
+		"""
+		Called when we are disconnected. Comes from network manager for example
+		we don't try to reconnect, network manager will tell us when we can
+		"""
 		if gajim.account_is_connected(self.name):
 			# we cannot change our status to offline or connecting
 			# after we auth to server
@@ -237,9 +177,10 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 		self.dispatch('ZC_NAME_CONFLICT', alt_name)
 
 	def _on_error(self, message):
-		self.dispatch('ERROR', (_('Avahi error'), _("%s\nLink-local messaging might not work properly.") % message))
+		self.dispatch('ERROR', (_('Avahi error'),
+			_('%s\nLink-local messaging might not work properly.') % message))
 
-	def connect(self, show = 'online', msg = ''):
+	def connect(self, show='online', msg=''):
 		self.get_config_values_or_default()
 		if not self.connection:
 			self.connection = client_zeroconf.ClientZeroconf(self)
@@ -270,10 +211,12 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 		self.roster = self.connection.getRoster()
 		self.dispatch('ROSTER', self.roster)
 
-		#display contacts already detected and resolved
+		# display contacts already detected and resolved
 		for jid in self.roster.keys():
-			self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid)))
-			self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0, None))
+			self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both',
+				'no', self.roster.getGroups(jid)))
+			self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid),
+				self.roster.getMessage(jid), 'local', 0, None, 0, None))
 
 		self.connected = STATUS_LIST.index(show)
 
@@ -282,7 +225,7 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 		gobject.timeout_add_seconds(5, self._on_resolve_timeout)
 		return True
 
-	def disconnect(self, on_purpose = False):
+	def disconnect(self, on_purpose=False):
 		self.connected = 0
 		self.time_to_reconnect = None
 		if self.connection:
@@ -294,15 +237,20 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 	def reannounce(self):
 		if self.connected:
 			txt = {}
-			txt['1st'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_first_name')
-			txt['last'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_last_name')
-			txt['jid'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_jabber_id')
-			txt['email'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_email')
+			txt['1st'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
+				'zeroconf_first_name')
+			txt['last'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
+				'zeroconf_last_name')
+			txt['jid'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
+				'zeroconf_jabber_id')
+			txt['email'] = gajim.config.get_per('accounts',
+				gajim.ZEROCONF_ACC_NAME, 'zeroconf_email')
 			self.connection.reannounce(txt)
 
 	def update_details(self):
 		if self.connection:
-			port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port')
+			port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
+				'custom_port')
 			if port != self.port:
 				self.port = port
 				last_msg = self.connection.last_msg
@@ -314,41 +262,18 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 			else:
 				self.reannounce()
 
-	def change_status(self, show, msg, sync = False, auto = False):
-		if not show in STATUS_LIST:
-			return -1
-		self.status = show
-
-		check = True		#to check for errors from zeroconf
-		# 'connect'
-		if show != 'offline' and not self.connected:
-			if not self.connect(show, msg):
-				return
-			if show != 'invisible':
-				check = self.connection.announce()
-			else:
-				self.connected = STATUS_LIST.index(show)
-			self.dispatch('SIGNED_IN', ())
-
-		# 'disconnect'
-		elif show == 'offline' and self.connected:
-			self.disconnect()
-			self.time_to_reconnect = None
-
-		# update status
-		elif show != 'offline' and self.connected:
-			was_invisible = self.connected == STATUS_LIST.index('invisible')
+	def connect_and_init(self, show, msg, sign_msg):
+		# to check for errors from zeroconf
+		check = True
+		if not self.connect(show, msg):
+			return
+		if show != 'invisible':
+			check = self.connection.announce()
+		else:
 			self.connected = STATUS_LIST.index(show)
-			if show == 'invisible':
-				check = check and self.connection.remove_announce()
-			elif was_invisible:
-				if not self.connected:
-					check = check and self.connect(show, msg)
-				check = check and self.connection.announce()
-			if self.connection and not show == 'invisible':
-				check = check and self.connection.set_show_msg(show, msg)
-
-		#stay offline when zeroconf does something wrong
+		self.dispatch('SIGNED_IN', ())
+
+		# stay offline when zeroconf does something wrong
 		if check:
 			self.dispatch('STATUS', show)
 		else:
@@ -359,136 +284,63 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 				(_('Could not change status of account "%s"') % self.name,
 				_('Please check if avahi-daemon is running.')))
 
-	def get_status(self):
-		return STATUS_LIST[self.connected]
+	def _change_to_invisible(self, msg):
+		if self.connection.remove_announce():
+			self.dispatch('STATUS', 'invisible')
+		else:
+			# show notification that avahi or system bus is down
+			self.dispatch('STATUS', 'offline')
+			self.status = 'offline'
+			self.dispatch('CONNECTION_LOST',
+				(_('Could not change status of account "%s"') % self.name,
+				_('Please check if avahi-daemon is running.')))
+
+	def _change_from_invisible(self):
+		self.connection.announce()
+
+	def _update_status(self, show, msg):
+		if self.connection.set_show_msg(show, msg):
+			self.dispatch('STATUS', show)
+		else:
+			# show notification that avahi or system bus is down
+			self.dispatch('STATUS', 'offline')
+			self.status = 'offline'
+			self.dispatch('CONNECTION_LOST',
+				(_('Could not change status of account "%s"') % self.name,
+				_('Please check if avahi-daemon is running.')))
 
 	def send_message(self, jid, msg, keyID, type_='chat', subject='',
 	chatstate=None, msg_id=None, composing_xep=None, resource=None,
 	user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None,
 	original_message=None, delayed=None, callback=None, callback_args=[]):
-		fjid = jid
-
-		if msg and not xhtml and gajim.config.get(
-		'rst_formatting_outgoing_messages'):
-			from common.rst_xhtml_generator import create_xhtml
-			xhtml = create_xhtml(msg)
-		if not self.connection:
-			return
-		if not msg and chatstate is None:
-			return
-
-		if self.status in ('invisible', 'offline'):
-			self.dispatch('MSGERROR', [unicode(jid), -1,
-				 _('You are not connected or not visible to others. Your message '
-				'could not be sent.'), None, None, session])
-			return
-
-		msgtxt = msg
-		msgenc = ''
-		if keyID and self.USE_GPG:
-			if keyID ==  'UNKNOWN':
-				error = _('Neither the remote presence is signed, nor a key was assigned.')
-			elif keyID.endswith('MISMATCH'):
-				error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8])
-			else:
-				# encrypt
-				msgenc, error = self.gpg.encrypt(msg, [keyID])
-			if msgenc and not error:
-				msgtxt = '[This message is encrypted]'
-				lang = os.getenv('LANG')
-				if lang is not None or lang != 'en': # we're not english
-					msgtxt = _('[This message is encrypted]') +\
-						' ([This message is encrypted])' # one  in locale and one en
-			else:
-				# Encryption failed, do not send message
-				tim = time.localtime()
-				self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
-				return
-
-		if type_ == 'chat':
-			msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_,
-				xhtml=xhtml)
-
-		else:
-			if subject:
-				msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
-					subject=subject, xhtml=xhtml)
-			else:
-				msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
-					xhtml=xhtml)
-
-		if msgenc:
-			msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc)
-
-		# chatstates - if peer supports jep85 or jep22, send chatstates
-		# please note that the only valid tag inside a message containing a <body>
-		# tag is the active event
-		if chatstate is not None:
-			if composing_xep == 'XEP-0085' or not composing_xep:
-				# JEP-0085
-				msg_iq.setTag(chatstate, namespace = common.xmpp.NS_CHATSTATES)
-			if composing_xep == 'XEP-0022' or not composing_xep:
-				# JEP-0022
-				chatstate_node = msg_iq.setTag('x', namespace = common.xmpp.NS_EVENT)
-				if not msgtxt: # when no <body>, add <id>
-					if not msg_id: # avoid putting 'None' in <id> tag
-						msg_id = ''
-					chatstate_node.setTagData('id', msg_id)
-				# when msgtxt, requests JEP-0022 composing notification
-				if chatstate is 'composing' or msgtxt:
-					chatstate_node.addChild(name = 'composing')
-
-		if forward_from:
-			addresses = msg_iq.addChild('addresses',
-				namespace=common.xmpp.NS_ADDRESS)
-			addresses.addChild('address', attrs = {'type': 'ofrom',
-				'jid': forward_from})
-
-		# XEP-0203
-		if delayed:
-			our_jid = gajim.get_jid_from_account(self.name) + '/' + \
-				self.server_resource
-			timestamp = time.strftime('%Y-%m-%dT%TZ', time.gmtime(delayed))
-			msg_iq.addChild('delay', namespace=common.xmpp.NS_DELAY2,
-				attrs={'from': our_jid, 'stamp': timestamp})
-
-		if session:
-			session.last_send = time.time()
-			msg_iq.setThread(session.thread_id)
-
-			if session.enable_encryption:
-				msg_iq = session.encrypt_stanza(msg_iq)
-
-		def on_send_ok(id):
-			no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for')
-			ji = gajim.get_jid_without_resource(jid)
-			if session.is_loggable() and self.name not in no_log_for and\
-			ji not in no_log_for:
-				log_msg = msg
-				if subject:
-					log_msg = _('Subject: %(subject)s\n%(message)s') % \
-					{'subject': subject, 'message': msg}
-				if log_msg:
-					if type_ == 'chat':
-						kind = 'chat_msg_sent'
-					else:
-						kind = 'single_msg_sent'
-					gajim.logger.write(kind, jid, log_msg)
 
+		def on_send_ok(msg_id):
 			self.dispatch('MSGSENT', (jid, msg, keyID))
-
 			if callback:
-				callback(id, *callback_args)
+				callback(msg_id, *callback_args)
+
+			self.log_message(jid, msg, forward_from, session, original_message,
+				subject, type_)
 
 		def on_send_not_ok(reason):
 			reason += ' ' + _('Your message could not be sent.')
 			self.dispatch('MSGERROR', [jid, -1, reason, None, None, session])
-		ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok,
-			on_not_ok=on_send_not_ok)
-		if ret == -1:
-			# Contact Offline
-			self.dispatch('MSGERROR', [jid, -1, _('Contact is offline. Your message could not be sent.'), None, None, session])
 
+		def cb(jid, msg, keyID, forward_from, session, original_message, subject,
+		type_, msg_iq):
+			ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok,
+				on_not_ok=on_send_not_ok)
+
+			if ret == -1:
+				# Contact Offline
+				self.dispatch('MSGERROR', [jid, -1, _('Contact is offline. Your '
+					'message could not be sent.'), None, None, session])
+
+		self._prepare_message(jid, msg, keyID, type_=type_, subject=subject,
+			chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep,
+			resource=resource, user_nick=user_nick, xhtml=xhtml, session=session,
+			forward_from=forward_from, form_node=form_node,
+			original_message=original_message, delayed=delayed, callback=cb)
 
 	def send_stanza(self, stanza):
 		# send a stanza untouched
@@ -498,95 +350,10 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 			stanza = common.xmpp.Protocol(node=stanza)
 		self.connection.send(stanza)
 
-	def ack_subscribed(self, jid):
-		gajim.log.debug('This should not happen (ack_subscribed)')
-
-	def ack_unsubscribed(self, jid):
-		gajim.log.debug('This should not happen (ack_unsubscribed)')
-
-	def request_subscription(self, jid, msg = '', name = '', groups = [],
-	auto_auth = False):
-		gajim.log.debug('This should not happen (request_subscription)')
-
-	def send_authorization(self, jid):
-		gajim.log.debug('This should not happen (send_authorization)')
-
-	def refuse_authorization(self, jid):
-		gajim.log.debug('This should not happen (refuse_authorization)')
-
-	def unsubscribe(self, jid, remove_auth = True):
-		gajim.log.debug('This should not happen (unsubscribe)')
-
-	def unsubscribe_agent(self, agent):
-		gajim.log.debug('This should not happen (unsubscribe_agent)')
-
-	def update_contact(self, jid, name, groups):
-		if self.connection:
-			self.connection.getRoster().setItem(jid = jid, name = name,
-				groups = groups)
-
-	def update_contacts(self, contacts):
-		'''update multiple roster items'''
-		if self.connection:
-			self.connection.getRoster().setItemMulti(contacts)
-
-	def new_account(self, name, config, sync = False):
-		gajim.log.debug('This should not happen (new_account)')
-
-	def _on_new_account(self, con = None, con_type = None):
-		gajim.log.debug('This should not happen (_on_new_account)')
-
-	def account_changed(self, new_name):
-		self.name = new_name
-
-	def request_last_status_time(self, jid, resource):
-		gajim.log.debug('This should not happen (request_last_status_time)')
-
-	def request_os_info(self, jid, resource):
-		gajim.log.debug('This should not happen (request_os_info)')
-
-	def get_settings(self):
-		gajim.log.debug('This should not happen (get_settings)')
-
-	def get_bookmarks(self):
-		gajim.log.debug('This should not happen (get_bookmarks)')
-
-	def store_bookmarks(self):
-		gajim.log.debug('This should not happen (store_bookmarks)')
-
-	def get_metacontacts(self):
-		gajim.log.debug('This should not happen (get_metacontacts)')
-
-	def send_agent_status(self, agent, ptype):
-		gajim.log.debug('This should not happen (send_agent_status)')
-
-	def gpg_passphrase(self, passphrase):
-		if self.gpg:
-			use_gpg_agent = gajim.config.get('use_gpg_agent')
-			if use_gpg_agent:
-				self.gpg.passphrase = None
-			else:
-				self.gpg.passphrase = passphrase
-
-	def ask_gpg_keys(self):
-		if self.gpg:
-			keys = self.gpg.get_keys()
-			return keys
-		return None
-
-	def ask_gpg_secrete_keys(self):
-		if self.gpg:
-			keys = self.gpg.get_secret_keys()
-			return keys
-		return None
-
 	def _event_dispatcher(self, realm, event, data):
+		CommonConnection._event_dispatcher(self, realm, event, data)
 		if realm == '':
-			if event == common.xmpp.transports_nb.DATA_RECEIVED:
-				self.dispatch('STANZA_ARRIVED', unicode(data, errors = 'ignore'))
-			elif event == common.xmpp.transports_nb.DATA_SENT:
-				self.dispatch('STANZA_SENT', unicode(data))
-			elif event == common.xmpp.transports.DATA_ERROR:
+			if event == common.xmpp.transports_nb.DATA_ERROR:
 				thread_id = data[1]
 				frm = unicode(data[0])
 				session = self.get_or_create_session(frm, thread_id)
@@ -594,9 +361,6 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 	            _('Connection to host could not be established: Timeout while '
 					'sending data.'), None, None, session])
 
-	def load_roster_from_db(self):
-		return
-
 # END ConnectionZeroconf
 
 # vim: se ts=3:
diff --git a/src/common/zeroconf/roster_zeroconf.py b/src/common/zeroconf/roster_zeroconf.py
index 42fe0edd6..4fe05aee1 100644
--- a/src/common/zeroconf/roster_zeroconf.py
+++ b/src/common/zeroconf/roster_zeroconf.py
@@ -37,9 +37,10 @@ class Roster:
 		return self
 
 	def getDiffs(self):
-		'''	update the roster with new data and return dict with
-		jid -> new status pairs to do notifications and stuff '''
-
+		"""
+		Update the roster with new data and return dict with jid -> new status
+		pairs to do notifications and stuff
+		"""
 		diffs = {}
 		old_data = self._data.copy()
 		self.update_roster()
diff --git a/src/common/zeroconf/zeroconf_avahi.py b/src/common/zeroconf/zeroconf_avahi.py
index baa373880..1db21adb4 100644
--- a/src/common/zeroconf/zeroconf_avahi.py
+++ b/src/common/zeroconf/zeroconf_avahi.py
@@ -77,7 +77,7 @@ class Zeroconf:
 		log.debug('Found service %s in domain %s on %i.%i.' % (name, domain,
 			interface, protocol))
 		if not self.connected:
-		 	return
+			return
 
 		# synchronous resolving
 		self.server.ResolveService( int(interface), int(protocol), name, stype,
@@ -90,7 +90,7 @@ class Zeroconf:
 		log.debug('Service %s in domain %s on %i.%i disappeared.' % (name,
 			domain, interface, protocol))
 		if not self.connected:
-		 	return
+			return
 		if name != self.name:
 			for key in self.contacts.keys():
 				if self.contacts[key][C_BARE_NAME] == name:
diff --git a/src/common/zeroconf/zeroconf_bonjour.py b/src/common/zeroconf/zeroconf_bonjour.py
index 10568a7a7..772c9b2f0 100644
--- a/src/common/zeroconf/zeroconf_bonjour.py
+++ b/src/common/zeroconf/zeroconf_bonjour.py
@@ -10,11 +10,11 @@
 ##
 ## Gajim is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Gajim.  If not, see <http://www.gnu.org/licenses/>.
+## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
 from common import gajim
@@ -28,14 +28,14 @@ except ImportError, e:
 	pass
 
 
-resolve_timeout  = 1
+resolve_timeout = 1
 
 class Zeroconf:
 	def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB,
 		disconnected_CB, error_CB, name, host, port):
-		self.domain = None   # specific domain to browse
+		self.domain = None # specific domain to browse
 		self.stype = '_presence._tcp'
-		self.port = port  # listening port that gets announced
+		self.port = port # listening port that gets announced
 		self.username = name
 		self.host = host
 		self.txt = pybonjour.TXTRecord()		# service data
@@ -48,7 +48,7 @@ class Zeroconf:
 		self.disconnected_CB = disconnected_CB
 		self.error_CB = error_CB
 
-		self.contacts = {}    # all current local contacts with data
+		self.contacts = {} # all current local contacts with data
 		self.connected = False
 		self.announced = False
 		self.invalid_self_contact = {}
@@ -58,7 +58,7 @@ class Zeroconf:
 	def browse_callback(self, sdRef, flags, interfaceIndex, errorCode, serviceName, regtype, replyDomain):
 		gajim.log.debug('Found service %s in domain %s on %i(type: %s).' % (serviceName, replyDomain, interfaceIndex, regtype))
 		if not self.connected:
-		 	return
+			return
 		if errorCode != pybonjour.kDNSServiceErr_NoError:
 			return
 		if not (flags & pybonjour.kDNSServiceFlagsAdd):
@@ -83,7 +83,7 @@ class Zeroconf:
 	def remove_service_callback(self, name):
 		gajim.log.debug('Service %s disappeared.' % name)
 		if not self.connected:
-		 	return
+			return
 		if name != self.name:
 			for key in self.contacts.keys():
 				if self.contacts[key][C_BARE_NAME] == name:
@@ -103,7 +103,7 @@ class Zeroconf:
 	def service_resolved_callback(self, sdRef, flags, interfaceIndex, errorCode, fullname,
 			hosttarget, port, txtRecord):
 
-        # TODO: do proper decoding...
+		# TODO: do proper decoding...
 		escaping= {
 		r'\.': '.',
 		r'\032': ' ',
@@ -211,7 +211,7 @@ class Zeroconf:
 		txt['version'] = 1
 		txt['txtvers'] = 1
 
-      # replace gajim's show messages with compatible ones
+		# replace gajim's show messages with compatible ones
 		if 'status' in self.txt:
 			txt['status'] = self.replace_show(self.txt['status'])
 		else:
@@ -221,7 +221,7 @@ class Zeroconf:
 
 		try:
 			sdRef = pybonjour.DNSServiceRegister(name = self.name,
-		   	   	regtype = self.stype, port = self.port, txtRecord = self.txt,
+				regtype = self.stype, port = self.port, txtRecord = self.txt,
 				callBack = self.service_added_callback)
 			self.service_sdRef = sdRef
 		except pybonjour.BonjourError, e:
diff --git a/src/config.py b/src/config.py
index a8e3b0902..e75d5eee8 100644
--- a/src/config.py
+++ b/src/config.py
@@ -59,21 +59,34 @@ from common.zeroconf import connection_zeroconf
 from common import dataforms
 from common import GnuPG
 
+try:
+	from common.multimedia_helpers import AudioInputManager, AudioOutputManager
+	from common.multimedia_helpers import VideoInputManager, VideoOutputManager
+	HAS_GST = True
+except ImportError:
+	HAS_GST = False
+
 from common.exceptions import GajimGeneralException
 
 #---------- PreferencesWindow class -------------#
 class PreferencesWindow:
-	'''Class for Preferences window'''
+	"""
+	Class for Preferences window
+	"""
 
 	def on_preferences_window_destroy(self, widget):
-		'''close window'''
+		"""
+		Close window
+		"""
 		del gajim.interface.instances['preferences']
 
 	def on_close_button_clicked(self, widget):
 		self.window.destroy()
 
 	def __init__(self):
-		'''Initialize Preferences window'''
+		"""
+		Initialize Preferences window
+		"""
 		self.xml = gtkgui_helpers.get_glade('preferences_window.glade')
 		self.window = self.xml.get_widget('preferences_window')
 		self.window.set_transient_for(gajim.interface.roster.window)
@@ -124,6 +137,11 @@ class PreferencesWindow:
 		self.xml.get_widget('show_tunes_in_roster_checkbutton'). \
 			set_active(st)
 
+		# Display location in roster
+		st = gajim.config.get('show_location_in_roster')
+		self.xml.get_widget('show_location_in_roster_checkbutton'). \
+			set_active(st)
+
 		# Sort contacts by show
 		st = gajim.config.get('sort_by_show_in_roster')
 		self.xml.get_widget('sort_by_show_in_roster_checkbutton').set_active(st)
@@ -297,8 +315,6 @@ class PreferencesWindow:
 			systray_combobox.set_active(1)
 		else:
 			systray_combobox.set_active(2)
-		if not gajim.interface.systray_capabilities:
-			systray_combobox.set_sensitive(False)
 
 		# sounds
 		if gajim.config.get('sounds_on'):
@@ -366,7 +382,8 @@ class PreferencesWindow:
 
 		# 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].to_string()
+		col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].\
+			to_string()
 		# (status, translated_status, message, enabled)
 		model = gtk.ListStore(str, str, str, bool)
 		self.default_msg_tree.set_model(model)
@@ -410,6 +427,41 @@ class PreferencesWindow:
 		buf = self.xml.get_widget('msg_textview').get_buffer()
 		buf.connect('changed', self.on_msg_textview_changed)
 
+		### Audio / Video tab ###
+		def create_av_combobox(opt_name, device_dict):
+			combobox = self.xml.get_widget(opt_name + '_combobox')
+			cell = gtk.CellRendererText()
+			combobox.pack_start(cell, True)
+			combobox.add_attribute(cell, 'text', 0)
+			model = gtk.ListStore(str, str)
+			combobox.set_model(model)
+
+			for index, (name, value) in enumerate(sorted(device_dict.iteritems())):
+				model.append((name, value))
+				if gajim.config.get(opt_name + '_device') == value:
+					combobox.set_active(index)
+
+		if HAS_GST:
+			create_av_combobox('audio_input', AudioInputManager().get_devices())
+			create_av_combobox('audio_output', AudioOutputManager().get_devices())
+			create_av_combobox('video_input', VideoInputManager().get_devices())
+			create_av_combobox('video_output', VideoOutputManager().get_devices())
+		else:
+			for opt_name in ('audio_input', 'audio_output', 'video_input',
+			'video_output'):
+				combobox = self.xml.get_widget(opt_name + '_combobox')
+				combobox.set_sensitive(False)
+
+		# STUN
+		cb = self.xml.get_widget('stun_checkbutton')
+		st = gajim.config.get('use_stun_server')
+		cb.set_active(st)
+
+		entry = self.xml.get_widget('stun_server_entry')
+		entry.set_text(gajim.config.get('stun_server'))
+		if not st:
+			entry.set_sensitive(False)
+
 		### Advanced tab ###
 		# open links with
 		if os.name == 'nt':
@@ -463,6 +515,14 @@ class PreferencesWindow:
 		else:
 			w.set_active(st)
 
+		# send idle time
+		w = self.xml.get_widget('send_idle_time_checkbutton')
+		st = self.get_per_account_option('send_idle_time')
+		if st == 'mixed':
+			w.set_inconsistent(True)
+		else:
+			w.set_active(st)
+
 		# check if gajm is default
 		st = gajim.config.get('check_if_gajim_is_default')
 		self.xml.get_widget('check_default_client_checkbutton').set_active(st)
@@ -497,8 +557,10 @@ class PreferencesWindow:
 			self.window.hide()
 
 	def get_per_account_option(self, opt):
-		'''Return the value of the option opt if it's the same in all accounts
-		else returns "mixed"'''
+		"""
+		Return the value of the option opt if it's the same in all accounts else
+		returns "mixed"
+		"""
 		if len(gajim.connections) == 0:
 			# a non existant key return default value
 			return gajim.config.get_per('accounts', '__default__', opt)
@@ -529,37 +591,43 @@ class PreferencesWindow:
 				w.set_sensitive(widget.get_active())
 		gajim.interface.save_config()
 
+	def _get_all_controls(self):
+		for ctrl in gajim.interface.msg_win_mgr.get_controls():
+			yield ctrl
+		for account in gajim.connections:
+			for ctrl in gajim.interface.minimized_controls[account].values():
+				yield ctrl
+
+	def _get_all_muc_controls(self):
+		for ctrl in gajim.interface.msg_win_mgr.get_controls(
+		message_control.TYPE_GC):
+			yield ctrl
+		for account in gajim.connections:
+			for ctrl in gajim.interface.minimized_controls[account].values():
+				yield ctrl
+
 	def on_sort_by_show_in_roster_checkbutton_toggled(self, widget):
 		self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster')
 		gajim.interface.roster.setup_and_draw_roster()
 
 	def on_sort_by_show_in_muc_checkbutton_toggled(self, widget):
 		self.on_checkbutton_toggled(widget, 'sort_by_show_in_muc')
-		# Redraw connected groupchats
-		for account in gajim.connections:
-			if gajim.connections[account].connected:
-				for gc_control in gajim.interface.msg_win_mgr.get_controls(
-				message_control.TYPE_GC) + \
-				gajim.interface.minimized_controls[account].values():
-					gc_control.draw_roster()
+		# Redraw groupchats
+		for ctrl in self._get_all_muc_controls():
+			ctrl.draw_roster()
 
 	def on_show_avatars_in_roster_checkbutton_toggled(self, widget):
 		self.on_checkbutton_toggled(widget, 'show_avatars_in_roster')
 		gajim.interface.roster.setup_and_draw_roster()
-		# Redraw connected groupchats (in an ugly way)
-		for account in gajim.connections:
-			if gajim.connections[account].connected:
-				for gc_control in gajim.interface.msg_win_mgr.get_controls(
-				message_control.TYPE_GC) + \
-				gajim.interface.minimized_controls[account].values():
-					gc_control.draw_roster()
+		# Redraw groupchats (in an ugly way)
+		for ctrl in self._get_all_muc_controls():
+			ctrl.draw_roster()
 
 	def on_show_status_msgs_in_roster_checkbutton_toggled(self, widget):
 		self.on_checkbutton_toggled(widget, 'show_status_msgs_in_roster')
 		gajim.interface.roster.setup_and_draw_roster()
-		for ctl in gajim.interface.msg_win_mgr.controls():
-			if ctl.type_id == message_control.TYPE_GC:
-				ctl.update_ui()
+		for ctrl in self._get_all_muc_controls():
+			ctrl.update_ui()
 
 	def on_show_mood_in_roster_checkbutton_toggled(self, widget):
 		self.on_checkbutton_toggled(widget, 'show_mood_in_roster')
@@ -573,6 +641,10 @@ class PreferencesWindow:
 		self.on_checkbutton_toggled(widget, 'show_tunes_in_roster')
 		gajim.interface.roster.setup_and_draw_roster()
 
+	def on_show_location_in_roster_checkbutton_toggled(self, widget):
+		self.on_checkbutton_toggled(widget, 'show_location_in_roster')
+		gajim.interface.roster.setup_and_draw_roster()
+
 	def on_emoticons_combobox_changed(self, widget):
 		active = widget.get_active()
 		model = widget.get_model()
@@ -587,9 +659,11 @@ class PreferencesWindow:
 		self.toggle_emoticons()
 
 	def toggle_emoticons(self):
-		'''Update emoticons state in Opened Chat Windows'''
-		for win in gajim.interface.msg_win_mgr.windows():
-			win.toggle_emoticons()
+		"""
+		Update emoticons state in Opened Chat Windows
+		"""
+		for ctrl in self._get_all_controls():
+			ctrl.toggle_emoticons()
 
 	def on_one_window_type_combo_changed(self, widget):
 		active = widget.get_active()
@@ -600,8 +674,8 @@ class PreferencesWindow:
 
 	def on_compact_view_checkbutton_toggled(self, widget):
 		active = widget.get_active()
-		for ctl in gajim.interface.msg_win_mgr.controls():
-			ctl.chat_buttons_set_visible(active)
+		for ctrl in self._get_all_controls():
+			ctrl.chat_buttons_set_visible(active)
 		gajim.config.set('compact_view', active)
 		gajim.interface.save_config()
 
@@ -610,7 +684,7 @@ class PreferencesWindow:
 		helpers.update_optional_features()
 
 	def apply_speller(self):
-		for ctrl in gajim.interface.msg_win_mgr.controls():
+		for ctrl in self._get_all_controls():
 			if isinstance(ctrl, chat_control.ChatControlBase):
 				try:
 					spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
@@ -621,7 +695,7 @@ class PreferencesWindow:
 					ctrl.set_speller()
 
 	def remove_speller(self):
-		for ctrl in gajim.interface.msg_win_mgr.controls():
+		for ctrl in self._get_all_controls():
 			if isinstance(ctrl, chat_control.ChatControlBase):
 				try:
 					spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
@@ -781,9 +855,11 @@ class PreferencesWindow:
 			self.sounds_preferences.window.present()
 
 	def update_text_tags(self):
-		'''Update color tags in Opened Chat Windows'''
-		for win in gajim.interface.msg_win_mgr.windows():
-			win.update_tags()
+		"""
+		Update color tags in opened chat windows
+		"""
+		for ctrl in self._get_all_controls():
+			ctrl.update_tags()
 
 	def on_preference_widget_color_set(self, widget, text):
 		color = widget.get_color()
@@ -802,9 +878,11 @@ class PreferencesWindow:
 		gajim.interface.save_config()
 
 	def update_text_font(self):
-		'''Update text font in Opened Chat Windows'''
-		for win in gajim.interface.msg_win_mgr.windows():
-			win.update_font()
+		"""
+		Update text font in opened chat windows
+		"""
+		for ctrl in self._get_all_controls():
+			ctrl.update_font()
 
 	def on_incoming_nick_colorbutton_color_set(self, widget):
 		self.on_preference_widget_color_set(widget, 'inmsgcolor')
@@ -835,7 +913,7 @@ class PreferencesWindow:
 		else:
 			font_widget.set_sensitive(True)
 		self.on_preference_widget_font_set(font_widget, 'conversation_font')
-	
+
 	def draw_color_widgets(self):
 		col_to_widget = {'inmsgcolor': 'incoming_nick_colorbutton',
 				'outmsgcolor': 'outgoing_nick_colorbutton',
@@ -881,7 +959,9 @@ class PreferencesWindow:
 		gajim.interface.save_config()
 
 	def _set_color(self, state, widget_name, option):
-		''' set color value in prefs and update the UI '''
+		"""
+		Set color value in prefs and update the UI
+		"""
 		if state:
 			color = self.xml.get_widget(widget_name).get_color()
 			color_string = gtkgui_helpers.make_color_string(color)
@@ -993,6 +1073,31 @@ class PreferencesWindow:
 	def on_msg_treemodel_row_deleted(self, model, path):
 		self.save_status_messages(model)
 
+	def on_av_combobox_changed(self, combobox, opt_name):
+		model = combobox.get_model()
+		active = combobox.get_active()
+		device = model[active][1].decode('utf-8')
+		gajim.config.set(opt_name + '_device', device)
+
+	def on_audio_input_combobox_changed(self, widget):
+		self.on_av_combobox_changed(widget, 'audio_input')
+
+	def on_audio_output_combobox_changed(self, widget):
+		self.on_av_combobox_changed(widget, 'audio_output')
+
+	def on_video_input_combobox_changed(self, widget):
+		self.on_av_combobox_changed(widget, 'video_input')
+
+	def on_video_output_combobox_changed(self, widget):
+		self.on_av_combobox_changed(widget, 'video_output')
+
+	def on_stun_checkbutton_toggled(self, widget):
+		self.on_checkbutton_toggled(widget, 'use_stun_server',
+			[self.xml.get_widget('stun_server_entry')])
+
+	def stun_server_entry_changed(self, widget):
+		gajim.config.set('stun_server', widget.get_text().decode('utf-8'))
+
 	def on_applications_combobox_changed(self, widget):
 		gajim.config.set('autodetect_browser_mailer', False)
 		if widget.get_active() == 4:
@@ -1033,6 +1138,10 @@ class PreferencesWindow:
 		widget.set_inconsistent(False)
 		self.on_per_account_checkbutton_toggled(widget, 'send_os_info')
 
+	def on_send_idle_time_checkbutton_toggled(self, widget):
+		widget.set_inconsistent(False)
+		self.on_per_account_checkbutton_toggled(widget, 'send_idle_time')
+
 	def on_check_default_client_checkbutton_toggled(self, widget):
 		self.on_checkbutton_toggled(widget, 'check_if_gajim_is_default')
 
@@ -1348,7 +1457,10 @@ class ManageProxiesWindow:
 
 #---------- AccountsWindow class -------------#
 class AccountsWindow:
-	'''Class for accounts window: list of accounts'''
+	"""
+	Class for accounts window: list of accounts
+	"""
+
 	def on_accounts_window_destroy(self, widget):
 		del gajim.interface.instances['accounts']
 
@@ -1363,8 +1475,7 @@ class AccountsWindow:
 		self.accounts_treeview = self.xml.get_widget('accounts_treeview')
 		self.remove_button = self.xml.get_widget('remove_button')
 		self.rename_button = self.xml.get_widget('rename_button')
-		path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-			'kbd_input.png')
+		path_to_kbd_input_img = gtkgui_helpers.get_icon_path('gajim-kbd_input')
 		img = self.xml.get_widget('rename_image')
 		img.set_from_file(path_to_kbd_input_img)
 		self.notebook = self.xml.get_widget('notebook')
@@ -1416,7 +1527,9 @@ class AccountsWindow:
 			iter_ = model.iter_next(iter_)
 
 	def init_accounts(self):
-		'''initialize listStore with existing accounts'''
+		"""
+		Initialize listStore with existing accounts
+		"""
 		self.remove_button.set_sensitive(False)
 		self.rename_button.set_sensitive(False)
 		self.current_account = None
@@ -1442,7 +1555,9 @@ class AccountsWindow:
 		elif self.need_relogin and self.current_account and \
 		gajim.connections[self.current_account].connected > 0:
 			def login(account, show_before, status_before):
-				''' login with previous status'''
+				"""
+				Login with previous status
+				"""
 				# first make sure connection is really closed,
 				# 0.5 may not be enough
 				gajim.connections[account].disconnect(True)
@@ -1475,7 +1590,9 @@ class AccountsWindow:
 		self.resend_presence = False
 
 	def on_accounts_treeview_cursor_changed(self, widget):
-		'''Activate modify buttons when a row is selected, update accounts info'''
+		"""
+		Activate modify buttons when a row is selected, update accounts info
+		"""
 		sel = self.accounts_treeview.get_selection()
 		(model, iter_) = sel.get_selected()
 		if iter_:
@@ -1741,7 +1858,9 @@ class AccountsWindow:
 			gajim.config.get_per('accounts', account, 'use_ft_proxies'))
 
 	def on_add_button_clicked(self, widget):
-		'''When add button is clicked: open an account information window'''
+		"""
+		When add button is clicked: open an account information window
+		"""
 		if 'account_creation_wizard' in gajim.interface.instances:
 			gajim.interface.instances['account_creation_wizard'].window.present()
 		else:
@@ -1749,8 +1868,10 @@ class AccountsWindow:
 				AccountCreationWizardWindow()
 
 	def on_remove_button_clicked(self, widget):
-		'''When delete button is clicked:
-		Remove an account from the listStore and from the config file'''
+		"""
+		When delete button is clicked: Remove an account from the listStore and
+		from the config file
+		"""
 		if not self.current_account:
 			return
 		account = self.current_account
@@ -2313,7 +2434,7 @@ class AccountsWindow:
 		# normal account
 		if self.ignore_events:
 			return
-		if gajim.account_is_connected(self.current_account):
+		if gajim.connections[self.current_account].connected > 0:
 			self.ignore_events = True
 			self.xml.get_widget('enable_zeroconf_checkbutton2').set_active(True)
 			self.ignore_events = False
@@ -2347,7 +2468,9 @@ class AccountsWindow:
 	def on_enable_checkbutton1_toggled(self, widget):
 		if self.ignore_events:
 			return
-		if gajim.account_is_connected(self.current_account):
+		if self.current_account in gajim.connections and \
+		gajim.connections[self.current_account].connected > 0:
+			# connecting or connected
 			self.ignore_events = True
 			self.xml.get_widget('enable_checkbutton1').set_active(True)
 			self.ignore_events = False
@@ -2411,8 +2534,11 @@ class AccountsWindow:
 			'zeroconf_email', email)
 
 class FakeDataForm(gtk.Table, object):
-	'''Class for forms that are in XML format <entry1>value1</entry1>
-	infos in a table {entry1: value1, }'''
+	"""
+	Class for forms that are in XML format <entry1>value1</entry1> infos in a
+	table {entry1: value1}
+	"""
+
 	def __init__(self, infos):
 		gtk.Table.__init__(self)
 		self.infos = infos
@@ -2420,7 +2546,9 @@ class FakeDataForm(gtk.Table, object):
 		self._draw_table()
 
 	def _draw_table(self):
-		'''Draw the table'''
+		"""
+		Draw the table
+		"""
 		nbrow = 0
 		if 'instructions' in self.infos:
 			nbrow = 1
@@ -2454,9 +2582,11 @@ class FakeDataForm(gtk.Table, object):
 		return self.infos
 
 class ServiceRegistrationWindow:
-	'''Class for Service registration window:
-	Window that appears when we want to subscribe to a service
-	if is_form we use dataforms_widget else we use service_registarion_window'''
+	"""
+	Class for Service registration window. Window that appears when we want to
+	subscribe to a service if is_form we use dataforms_widget else we use
+	service_registarion_window
+	"""
 	def __init__(self, service, infos, account, is_form):
 		self.service = service
 		self.account = account
@@ -2503,7 +2633,7 @@ class ServiceRegistrationWindow:
 		self.window.destroy()
 
 class GroupchatConfigWindow:
-	'''GroupchatConfigWindow class'''
+
 	def __init__(self, account, room_jid, form = None):
 		self.account = account
 		self.room_jid = room_jid
@@ -2656,7 +2786,9 @@ class GroupchatConfigWindow:
 		self.remove_button[affiliation].set_sensitive(True)
 
 	def affiliation_list_received(self, users_dict):
-		'''Fill the affiliation treeview'''
+		"""
+		Fill the affiliation treeview
+		"""
 		for jid in users_dict:
 			affiliation = users_dict[jid]['affiliation']
 			if affiliation not in self.affiliation_labels.keys():
@@ -2705,8 +2837,10 @@ class GroupchatConfigWindow:
 
 #---------- RemoveAccountWindow class -------------#
 class RemoveAccountWindow:
-	'''ask for removing from gajim only or from gajim and server too
-	and do removing of the account given'''
+	"""
+	Ask for removing from gajim only or from gajim and server too and do
+	removing of the account given
+	"""
 
 	def on_remove_account_window_destroy(self, widget):
 		if self.account in gajim.interface.instances:
@@ -2906,7 +3040,9 @@ class ManageBookmarksWindow:
 		del gajim.interface.instances['manage_bookmarks']
 
 	def on_add_bookmark_button_clicked(self, widget):
-		'''Add a new bookmark.'''
+		"""
+		Add a new bookmark
+		"""
 		# Get the account that is currently used
 		# (the parent of the currently selected item)
 		(model, iter_) = self.selection.get_selected()
@@ -2931,9 +3067,9 @@ class ManageBookmarksWindow:
 		self.view.set_cursor(model.get_path(iter_))
 
 	def on_remove_bookmark_button_clicked(self, widget):
-		'''
-		Remove selected bookmark.
-		'''
+		"""
+		Remove selected bookmark
+		"""
 		(model, iter_) = self.selection.get_selected()
 		if not iter_: # Nothing selected
 			return
@@ -2946,9 +3082,9 @@ class ManageBookmarksWindow:
 		self.clear_fields()
 
 	def check_valid_bookmark(self):
-		'''
-		Check if all neccessary fields are entered correctly.
-		'''
+		"""
+		Check if all neccessary fields are entered correctly
+		"""
 		(model, iter_) = self.selection.get_selected()
 
 		if not model.iter_parent(iter_):
@@ -2965,10 +3101,10 @@ class ManageBookmarksWindow:
 		return True
 
 	def on_ok_button_clicked(self, widget):
-		'''
-		Parse the treestore data into our new bookmarks array,
-		then send the new bookmarks to the server.
-		'''
+		"""
+		Parse the treestore data into our new bookmarks array, then send the new
+		bookmarks to the server.
+		"""
 		(model, iter_) = self.selection.get_selected()
 		if iter_ and model.iter_parent(iter_):
 			#bookmark selected, check it
@@ -2999,9 +3135,9 @@ class ManageBookmarksWindow:
 		self.window.destroy()
 
 	def bookmark_selected(self, selection):
-		'''
+		"""
 		Fill in the bookmark's data into the fields.
-		'''
+		"""
 		(model, iter_) = selection.get_selected()
 
 		if not iter_:
@@ -3148,6 +3284,7 @@ class AccountCreationWizardWindow:
 		self.xml = gtkgui_helpers.get_glade(
 			'account_creation_wizard_window.glade')
 		self.window = self.xml.get_widget('account_creation_wizard_window')
+		self.window.set_transient_for(gajim.interface.roster.window)
 
 		completion = gtk.EntryCompletion()
 		# Connect events from comboboxentry.child
@@ -3274,7 +3411,7 @@ class AccountCreationWizardWindow:
 		if self.modify:
 			img.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_DIALOG)
 		else:
-			path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png')
+			path_to_file = gtkgui_helpers.get_icon_path('gajim', 48)
 			img.set_from_file(path_to_file)
 		self.show_vcard_checkbutton.set_active(not self.modify)
 		self.notebook.set_current_page(6) # show finish page
@@ -3445,8 +3582,10 @@ class AccountCreationWizardWindow:
 		return True # loop forever
 
 	def new_acc_connected(self, form, is_form, ssl_msg, ssl_err, ssl_cert,
-	ssl_fingerprint):
-		'''connection to server succeded, present the form to the user.'''
+			ssl_fingerprint):
+		"""
+		Connection to server succeded, present the form to the user
+		"""
 		if self.update_progressbar_timeout_id is not None:
 			gobject.source_remove(self.update_progressbar_timeout_id)
 		self.back_button.show()
@@ -3480,7 +3619,9 @@ class AccountCreationWizardWindow:
 			self.notebook.set_current_page(4) # show form page
 
 	def new_acc_not_connected(self, reason):
-		'''Account creation failed: connection to server failed'''
+		"""
+		Account creation failed: connection to server failed
+		"""
 		if self.account not in gajim.connections:
 			return
 		if self.update_progressbar_timeout_id is not None:
@@ -3500,7 +3641,9 @@ class AccountCreationWizardWindow:
 		self.notebook.set_current_page(6) # show finish page
 
 	def acc_is_ok(self, config):
-		'''Account creation succeeded'''
+		"""
+		Account creation succeeded
+		"""
 		self.create_vars(config)
 		self.show_finish_page()
 
@@ -3508,7 +3651,9 @@ class AccountCreationWizardWindow:
 			gobject.source_remove(self.update_progressbar_timeout_id)
 
 	def acc_is_not_ok(self, reason):
-		'''Account creation failed'''
+		"""
+		Account creation failed
+		"""
 		self.back_button.show()
 		self.cancel_button.show()
 		self.go_online_checkbutton.hide()
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 837e2a0ce..02f949376 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -67,13 +67,15 @@ def has_focus(widget):
 
 class TextViewImage(gtk.Image):
 
-	def __init__(self, anchor):
+	def __init__(self, anchor, text):
 		super(TextViewImage, self).__init__()
 		self.anchor = anchor
 		self._selected = False
 		self._disconnect_funcs = []
 		self.connect('parent-set', self.on_parent_set)
 		self.connect('expose-event', self.on_expose)
+		self.set_tooltip_text(text)
+		self.anchor.set_data('plaintext', text)
 
 	def _get_selected(self):
 		parent = self.get_parent()
@@ -156,8 +158,10 @@ class TextViewImage(gtk.Image):
 
 
 class ConversationTextview(gobject.GObject):
-	'''Class for the conversation textview (where user reads already said
-	messages) for chat/groupchat windows'''
+	"""
+	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
@@ -165,18 +169,19 @@ class ConversationTextview(gobject.GObject):
 		)
 	)
 
-	FOCUS_OUT_LINE_PIXBUF = gtk.gdk.pixbuf_new_from_file(os.path.join(
-		gajim.DATA_DIR, 'pixmaps', 'muc_separator.png'))
-	XEP0184_WARNING_PIXBUF = gtk.gdk.pixbuf_new_from_file(os.path.join(
-		gajim.DATA_DIR, 'pixmaps', 'receipt_missing.png'))
+	FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap('gajim-muc_separator')
+	XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap(
+		'gajim-receipt_missing')
 
 	# smooth scroll constants
 	MAX_SCROLL_TIME = 0.4 # seconds
 	SCROLL_DELAY = 33 # milliseconds
 
 	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'''
+		"""
+		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
 
@@ -640,8 +645,9 @@ class ConversationTextview(gobject.GObject):
 		return False
 
 	def on_textview_motion_notify_event(self, widget, event):
-		'''change the cursor to a hand when we are over a mail or an
-		url'''
+		"""
+		Change the cursor to a hand when we are over a mail or an url
+		"""
 		pointer_x, pointer_y = self.tv.window.get_pointer()[0:2]
 		x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT,
 			pointer_x, pointer_y)
@@ -686,7 +692,9 @@ class ConversationTextview(gobject.GObject):
 			self.change_cursor = True
 
 	def clear(self, tv = None):
-		'''clear text in the textview'''
+		"""
+		Clear text in the textview
+		"""
 		buffer_ = self.tv.get_buffer()
 		start, end = buffer_.get_bounds()
 		buffer_.delete(start, end)
@@ -696,15 +704,18 @@ class ConversationTextview(gobject.GObject):
 		self.focus_out_end_mark = None
 
 	def visit_url_from_menuitem(self, widget, link):
-		'''basically it filters out the widget instance'''
+		"""
+		Basically it filters out the widget instance
+		"""
 		helpers.launch_browser_mailer('url', link)
 
 	def on_textview_populate_popup(self, textview, menu):
-		'''we override the default context menu and we prepend Clear
-		(only if used_in_history_window is False)
-		and if we have sth selected we show a submenu with actions on
-		the phrase (see on_conversation_textview_button_press_event)'''
-
+		"""
+		Override the default context menu and we prepend Clear (only if
+		used_in_history_window is False) and if we have sth selected we show a
+		submenu with actions on the phrase (see
+		on_conversation_textview_button_press_event)
+		"""
 		separator_menuitem_was_added = False
 		if not self.used_in_history_window:
 			item = gtk.SeparatorMenuItem()
@@ -897,16 +908,7 @@ class ConversationTextview(gobject.GObject):
 				self.on_join_group_chat_menuitem_activate, text)
 			self.handlers[id_] = childs[6]
 
-			allow_add = False
 			if self.account:
-				c = gajim.contacts.get_first_contact_from_jid(self.account, text)
-				if c and not gajim.contacts.is_pm_from_contact(self.account, c):
-					if _('Not in Roster') in c.groups:
-						allow_add = True
-				else: # he or she's not at all in the account contacts
-					allow_add = True
-
-			if allow_add:
 				id_ = childs[7].connect('activate', self.on_add_to_roster_activate,
 					text)
 				self.handlers[id_] = childs[7]
@@ -969,13 +971,13 @@ class ConversationTextview(gobject.GObject):
 
 
 	def detect_and_print_special_text(self, otext, other_tags, graphics=True):
-		'''detects special text (emots & links & formatting)
-		prints normal text before any special text it founts,
-		then print special text (that happens many times until
-		last special text is printed) and then returns the index
+		"""
+		Detect special text (emots & links & formatting), print normal text
+		before any special text it founds, then print special text (that happens
+		many times until last special text is printed) and then return the index
 		after *last* special text, so we can print it in
-		print_conversation_line()'''
-
+		print_conversation_line()
+		"""
 		buffer_ = self.tv.get_buffer()
 		
 		insert_tags_func = buffer_.insert_with_tags_by_name
@@ -1021,8 +1023,10 @@ class ConversationTextview(gobject.GObject):
 		return buffer_.get_end_iter()
 
 	def print_special_text(self, special_text, other_tags, graphics=True):
-		'''is called by detect_and_print_special_text and prints
-		special text (emots, links, formatting)'''
+		"""
+		Is called by detect_and_print_special_text and prints special text
+		(emots, links, formatting)
+		"""
 		tags = []
 		use_other_tags = True
 		text_is_valid_uri = False
@@ -1043,7 +1047,7 @@ class ConversationTextview(gobject.GObject):
 			emot_ascii = possible_emot_ascii_caps
 			end_iter = buffer_.get_end_iter()
 			anchor = buffer_.create_child_anchor(end_iter)
-			img = TextViewImage(anchor)
+			img = TextViewImage(anchor, special_text)
 			animations = gajim.interface.emoticons_animations
 			if not emot_ascii in animations:
 				animations[emot_ascii] = gtk.gdk.PixbufAnimation(
@@ -1125,7 +1129,7 @@ class ConversationTextview(gobject.GObject):
 			end_iter = buffer_.get_end_iter()
 			if imagepath is not None:
 				anchor = buffer_.create_child_anchor(end_iter)
-				img = gtk.Image()
+				img = TextViewImage(anchor, special_text)
 				img.set_from_file(imagepath)
 				img.show()
 				# add
@@ -1161,9 +1165,12 @@ class ConversationTextview(gobject.GObject):
 		buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol')
 
 	def print_conversation_line(self, text, jid, kind, name, tim,
-	other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[],
-	subject=None, old_kind=None, xhtml=None, simple=False, graphics=True):
-		'''prints 'chat' type messages'''
+			other_tags_for_name=[], other_tags_for_time=[],
+			other_tags_for_text=[], subject=None, old_kind=None, xhtml=None,
+			simple=False, graphics=True):
+		"""
+		Print 'chat' type messages
+		"""
 		buffer_ = self.tv.get_buffer()
 		buffer_.begin_user_action()
 		if self.marks_queue.full():
@@ -1261,8 +1268,10 @@ class ConversationTextview(gobject.GObject):
 		buffer_.end_user_action()
 
 	def get_time_to_show(self, tim):
-		'''Get the time, with the day before if needed and return it.
-		It DOESN'T format a fuzzy time'''
+		"""
+		Get the time, with the day before if needed and return it. It DOESN'T
+		format a fuzzy time
+		"""
 		format = ''
 		# get difference in days since epoch (86400 = 24*3600)
 		# number of days since epoch for current time (in GMT) -
@@ -1315,8 +1324,10 @@ class ConversationTextview(gobject.GObject):
 			self.print_empty_line()
 
 	def print_real_text(self, text, text_tags=[], name=None, xhtml=None,
-	graphics=True):
-		'''this adds normal and special text. call this to add text'''
+			graphics=True):
+		"""
+		Add normal and special text. call this to add text
+		"""
 		if xhtml:
 			try:
 				if name and (text.startswith('/me ') or text.startswith('/me\n')):
diff --git a/src/dataforms_widget.py b/src/dataforms_widget.py
index 18195dccd..4a9681dab 100644
--- a/src/dataforms_widget.py
+++ b/src/dataforms_widget.py
@@ -38,7 +38,10 @@ import itertools
 
 class DataFormWidget(gtk.Alignment, object):
 # "public" interface
-	''' Data Form widget. Use like any other widget. '''
+	"""
+	Data Form widget. Use like any other widget
+	"""
+
 	def __init__(self, dataformnode=None):
 		''' Create a widget. '''
 		gtk.Alignment.__init__(self, xscale=1.0, yscale=1.0)
@@ -65,7 +68,9 @@ class DataFormWidget(gtk.Alignment, object):
 		selection.set_mode(gtk.SELECTION_MULTIPLE)
 
 	def set_data_form(self, dataform):
-		''' Set the data form (xmpp.DataForm) displayed in widget. '''
+		"""
+		Set the data form (xmpp.DataForm) displayed in widget
+		"""
 		assert isinstance(dataform, dataforms.DataForm)
 
 		self.del_data_form()
@@ -84,7 +89,9 @@ class DataFormWidget(gtk.Alignment, object):
 			gtkgui_helpers.label_set_autowrap(self.instructions_label)
 
 	def get_data_form(self):
-		''' Data form displayed in the widget or None if no form. '''
+		"""
+		Data form displayed in the widget or None if no form
+		"""
 		return self._data_form
 
 	def del_data_form(self):
@@ -95,8 +102,10 @@ class DataFormWidget(gtk.Alignment, object):
 		'Data form presented in a widget')
 
 	def get_title(self):
-		''' Get the title of data form, as a unicode object. If no
-		title or no form, returns u''. Useful for setting window title. '''
+		"""
+		Get the title of data form, as a unicode object. If no title or no form,
+		returns u''. Useful for setting window title
+		"""
 		if self._data_form is not None:
 			if self._data_form.title is not None:
 				return self._data_form.title
@@ -117,9 +126,11 @@ class DataFormWidget(gtk.Alignment, object):
 		pass
 
 	def clean_data_form(self):
-		'''Remove data about existing form. This metod is empty, because
-		it is rewritten by build_*_data_form, according to type of form
-		which is actually displayed.'''
+		"""
+		Remove data about existing form. This metod is empty, because it is
+		rewritten by build_*_data_form, according to type of form which is
+		actually displayed
+		"""
 		pass
 
 	def build_single_data_form(self):
@@ -138,14 +149,18 @@ class DataFormWidget(gtk.Alignment, object):
 		self.clean_data_form = self.clean_single_data_form
 
 	def clean_single_data_form(self):
-		'''(Called as clean_data_form, read the docs of clean_data_form()).
-		Remove form from widget.'''
+		"""
+		Called as clean_data_form, read the docs of clean_data_form(). Remove
+		form from widget
+		"""
 		self.singleform.destroy()
 		self.clean_data_form = self.empty_method	# we won't call it twice
 		del self.singleform
 
 	def build_multiple_data_form(self):
-		'''Invoked when new multiple form is to be created.'''
+		"""
+		Invoked when new multiple form is to be created
+		"""
 		assert isinstance(self._data_form, dataforms.MultipleDataForm)
 
 		self.clean_data_form()
@@ -196,13 +211,17 @@ class DataFormWidget(gtk.Alignment, object):
 			self.refresh_multiple_buttons()
 
 	def clean_multiple_data_form(self):
-		'''(Called as clean_data_form, read the docs of clean_data_form()).
-		Remove form from widget.'''
+		"""
+		Called as clean_data_form, read the docs of clean_data_form(). Remove
+		form from widget
+		"""
 		self.clean_data_form = self.empty_method	# we won't call it twice
 		del self.multiplemodel
 
 	def refresh_multiple_buttons(self):
-		''' Checks for treeview state and makes control buttons sensitive.'''
+		"""
+		Checks for treeview state and makes control buttons sensitive
+		"""
 		selection = self.records_treeview.get_selection()
 		model = self.records_treeview.get_model()
 		count = selection.count_selected_rows()
@@ -273,9 +292,12 @@ class DataFormWidget(gtk.Alignment, object):
 		self.refresh_multiple_buttons()
 
 class SingleForm(gtk.Table, object):
-	''' Widget that represent DATAFORM_SINGLE mode form. Because this is used
-	not only to display single forms, but to form input windows of multiple-type
-	forms, it is in another class.'''
+	"""
+	Widget that represent DATAFORM_SINGLE mode form. Because this is used not
+	only to display single forms, but to form input windows of multiple-type
+	forms, it is in another class
+	"""
+
 	def __init__(self, dataform):
 		assert isinstance(dataform, dataforms.SimpleDataForm)
 
@@ -284,9 +306,11 @@ class SingleForm(gtk.Table, object):
 		self.set_row_spacings(6)
 
 		def decorate_with_tooltip(widget, field):
-			''' Adds a tooltip containing field's description to a widget.
-			Creates EventBox if widget doesn't have its own gdk window.
-			Returns decorated widget. '''
+			"""
+			Adds a tooltip containing field's description to a widget.  Creates
+			EventBox if widget doesn't have its own gdk window.  Returns decorated
+			widget
+			"""
 			if field.description != '':
 				if widget.flags() & gtk.NO_WINDOW:
 					evbox = gtk.EventBox()
diff --git a/src/dialogs.py b/src/dialogs.py
index 1e4e6266b..4f1799a33 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -32,7 +32,6 @@
 import gtk
 import gobject
 import os
-from weakref import WeakValueDictionary
 
 import gtkgui_helpers
 import vcard
@@ -61,9 +60,14 @@ from common import dataforms
 from common.exceptions import GajimGeneralException
 
 class EditGroupsDialog:
-	'''Class for the edit group dialog window'''
+	"""
+	Class for the edit group dialog window
+	"""
+
 	def __init__(self, list_):
-		'''list_ is a list of (contact, account) tuples'''
+		"""
+		list_ is a list of (contact, account) tuples
+		"""
 		self.xml = gtkgui_helpers.get_glade('edit_groups_dialog.glade')
 		self.dialog = self.xml.get_widget('edit_groups_dialog')
 		self.dialog.set_transient_for(gajim.interface.roster.window)
@@ -96,7 +100,9 @@ class EditGroupsDialog:
 			self.dialog.destroy()
 
 	def remove_group(self, group):
-		'''remove group group from all contacts and all their brothers'''
+		"""
+		Remove group group from all contacts and all their brothers
+		"""
 		for (contact, account) in self.list_:
 			gajim.interface.roster.remove_contact_from_groups(contact.jid, account, [group])
 
@@ -104,7 +110,9 @@ class EditGroupsDialog:
 		gajim.interface.roster.draw_group(_('General'), account)
 
 	def add_group(self, group):
-		'''add group group to all contacts and all their brothers'''
+		"""
+		Add group group to all contacts and all their brothers
+		"""
 		for (contact, account) in self.list_:
 			gajim.interface.roster.add_contact_to_groups(contact.jid, account, [group])
 
@@ -199,7 +207,9 @@ class EditGroupsDialog:
 		column.set_attributes(renderer, active=1, inconsistent=2)
 
 class PassphraseDialog:
-	'''Class for Passphrase dialog'''
+	"""
+	Class for Passphrase dialog
+	"""
 	def __init__(self, titletext, labeltext, checkbuttontext=None,
 	ok_handler=None, cancel_handler=None):
 		self.xml = gtkgui_helpers.get_glade('passphrase_dialog.glade')
@@ -258,7 +268,10 @@ class PassphraseDialog:
 			self.cancel_handler()
 
 class ChooseGPGKeyDialog:
-	'''Class for GPG key dialog'''
+	"""
+	Class for GPG key dialog
+	"""
+
 	def __init__(self, title_text, prompt_text, secret_keys, on_response,
 				 selected=None):
 		'''secret_keys : {keyID: userName, ...}'''
@@ -428,9 +441,9 @@ class ChangeActivityDialog:
 			self.subactivity = data[1]
 
 	def on_ok_button_clicked(self, widget):
-		'''
+		"""
 		Return activity and messsage (None if no activity selected)
-		'''
+		"""
 		if self.checkbutton.get_active():
 			self.on_response(self.activity, self.subactivity,
 				self.entry.get_text().decode('utf-8'))
@@ -524,10 +537,10 @@ class ChangeMoodDialog:
 		self.window.destroy()
 
 class TimeoutDialog:
-	'''
+	"""
 	Class designed to be derivated to create timeout'd dialogs (dialogs that
 	closes automatically after a timeout)
-	'''
+	"""
 	def __init__(self, timeout, on_timeout):
 		self.countdown_left = timeout
 		self.countdown_enabled = True
@@ -540,7 +553,9 @@ class TimeoutDialog:
 			gobject.timeout_add_seconds(1, self.countdown)
 
 	def on_timeout():
-		'''To be implemented in derivated classes'''
+		"""
+		To be implemented in derivated classes
+		"""
 		pass
 
 	def countdown(self):
@@ -638,7 +653,9 @@ class ChangeStatusMessageDialog(TimeoutDialog):
 		self.dialog.show_all()
 
 	def draw_activity(self):
-		'''Set activity button'''
+		"""
+		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 \
@@ -661,7 +678,9 @@ class ChangeStatusMessageDialog(TimeoutDialog):
 			label.set_text('')
 
 	def draw_mood(self):
-		'''Set mood button'''
+		"""
+		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:
@@ -803,13 +822,17 @@ class ChangeStatusMessageDialog(TimeoutDialog):
 						 self.pep_dict['mood_text'])
 
 class AddNewContactWindow:
-	'''Class for AddNewContactWindow'''
+	"""
+	Class for AddNewContactWindow
+	"""
+
 	uid_labels = {'jabber': _('Jabber ID:'),
 				  'aim': _('AIM Address:'),
 				  'gadu-gadu': _('GG Number:'),
 				  'icq': _('ICQ Number:'),
 				  'msn': _('MSN Address:'),
 				  'yahoo': _('Yahoo! Address:')}
+
 	def __init__(self, account=None, jid=None, user_nick=None, group=None):
 		self.account = account
 		if account is None:
@@ -983,11 +1006,15 @@ _('Please fill in the data of the contact you want to add in account %s') %accou
 			self.window.destroy()
 
 	def on_cancel_button_clicked(self, widget):
-		'''When Cancel button is clicked'''
+		"""
+		When Cancel button is clicked
+		"""
 		self.window.destroy()
 
 	def on_add_button_clicked(self, widget):
-		'''When Subscribe button is clicked'''
+		"""
+		When Subscribe button is clicked
+		"""
 		jid = self.uid_entry.get_text().decode('utf-8').strip()
 		if not jid:
 			return
@@ -1111,7 +1138,10 @@ _('Please fill in the data of the contact you want to add in account %s') %accou
 			self.add_button.set_sensitive(False)
 
 class AboutDialog:
-	'''Class for about dialog'''
+	"""
+	Class for about dialog
+	"""
+	
 	def __init__(self):
 		dlg = gtk.AboutDialog()
 		dlg.set_transient_for(gajim.interface.roster.window)
@@ -1159,8 +1189,7 @@ class AboutDialog:
 
 		dlg.props.wrap_license = True
 
-		pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(
-			gajim.DATA_DIR, 'pixmaps', 'gajim_about.png'))
+		pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-about', 128)
 
 		dlg.set_logo(pixbuf)
 		#here you write your name in the form Name FamilyName <someone@somewhere>
@@ -1184,7 +1213,9 @@ class AboutDialog:
 		return str_[0:-1] # remove latest .
 
 	def get_path(self, filename):
-		'''where can we find this Credits file ?'''
+		"""
+		Where can we find this Credits file?
+		"""
 		if os.path.isfile(os.path.join(gajim.defs.docdir, filename)):
 			return os.path.join(gajim.defs.docdir, filename)
 		elif os.path.isfile('../' + filename):
@@ -1273,14 +1304,18 @@ class HigDialog(gtk.MessageDialog):
 		self.destroy()
 
 	def popup(self):
-		'''show dialog'''
+		"""
+		Show dialog
+		"""
 		vb = self.get_children()[0].get_children()[0] # Give focus to top vbox
 		vb.set_flags(gtk.CAN_FOCUS)
 		vb.grab_focus()
 		self.show_all()
 
 class FileChooserDialog(gtk.FileChooserDialog):
-	'''Non-blocking FileChooser Dialog around gtk.FileChooserDialog'''
+	"""
+	Non-blocking FileChooser Dialog around gtk.FileChooserDialog
+	"""
 	def __init__(self, title_text, action, buttons, default_response,
 				 select_multiple = False, current_folder = None, on_response_ok = None,
 				 on_response_cancel = None):
@@ -1332,7 +1367,10 @@ class AspellDictError:
 		gajim.config.set('use_speller', False)
 
 class ConfirmationDialog(HigDialog):
-	'''HIG compliant confirmation dialog.'''
+	"""
+	HIG compliant confirmation dialog
+	"""
+
 	def __init__(self, pritext, sectext='', on_response_ok=None,
 				 on_response_cancel=None):
 		self.user_response_ok = on_response_ok
@@ -1359,7 +1397,10 @@ class ConfirmationDialog(HigDialog):
 		self.destroy()
 
 class NonModalConfirmationDialog(HigDialog):
-	'''HIG compliant non modal confirmation dialog.'''
+	"""
+	HIG compliant non modal confirmation dialog
+	"""
+
 	def __init__(self, pritext, sectext='', on_response_ok=None,
 				 on_response_cancel=None):
 		self.user_response_ok = on_response_ok
@@ -1386,8 +1427,11 @@ class NonModalConfirmationDialog(HigDialog):
 		self.destroy()
 
 class WarningDialog(HigDialog):
+	"""
+	HIG compliant warning dialog
+	"""
+
 	def __init__(self, pritext, sectext=''):
-		'''HIG compliant warning dialog.'''
 		HigDialog.__init__( self, None,
 							gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, pritext, sectext)
 		self.set_modal(False)
@@ -1396,8 +1440,11 @@ class WarningDialog(HigDialog):
 		self.popup()
 
 class InformationDialog(HigDialog):
+	"""
+	HIG compliant info dialog
+	"""
+
 	def __init__(self, pritext, sectext=''):
-		'''HIG compliant info dialog.'''
 		HigDialog.__init__(self, None,
 						   gtk.MESSAGE_INFO, gtk.BUTTONS_OK, pritext, sectext)
 		self.set_modal(False)
@@ -1405,16 +1452,22 @@ class InformationDialog(HigDialog):
 		self.popup()
 
 class ErrorDialog(HigDialog):
+	"""
+	HIG compliant error dialog
+	"""
+
 	def __init__(self, pritext, sectext=''):
-		'''HIG compliant error dialog.'''
 		HigDialog.__init__( self, None,
 							gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, pritext, sectext)
 		self.popup()
 
 class YesNoDialog(HigDialog):
+	"""
+	HIG compliant YesNo dialog
+	"""
+
 	def __init__(self, pritext, sectext='', checktext='', on_response_yes=None,
-				 on_response_no=None):
-		'''HIG compliant YesNo dialog.'''
+			on_response_no=None):
 		self.user_response_yes = on_response_yes
 		self.user_response_no = on_response_no
 		HigDialog.__init__( self, None,
@@ -1448,15 +1501,20 @@ class YesNoDialog(HigDialog):
 		self.destroy()
 
 	def is_checked(self):
-		''' Get active state of the checkbutton '''
+		"""
+		Get active state of the checkbutton
+		"""
 		if not self.checkbutton:
 			return False
 		return self.checkbutton.get_active()
 
 class ConfirmationDialogCheck(ConfirmationDialog):
-	'''HIG compliant confirmation dialog with checkbutton.'''
-	def __init__(self, pritext, sectext='', checktext='',
-				 on_response_ok=None, on_response_cancel=None, is_modal=True):
+	"""
+	HIG compliant confirmation dialog with checkbutton
+	"""
+
+	def __init__(self, pritext, sectext='', checktext='', on_response_ok=None,
+			on_response_cancel=None, is_modal=True):
 		self.user_response_ok = on_response_ok
 		self.user_response_cancel = on_response_cancel
 
@@ -1495,11 +1553,16 @@ class ConfirmationDialogCheck(ConfirmationDialog):
 		self.destroy()
 
 	def is_checked(self):
-		''' Get active state of the checkbutton '''
+		"""
+		Get active state of the checkbutton
+		"""
 		return self.checkbutton.get_active()
 
 class ConfirmationDialogDubbleCheck(ConfirmationDialog):
-	'''HIG compliant confirmation dialog with 2 checkbuttons.'''
+	"""
+	HIG compliant confirmation dialog with 2 checkbuttons
+	"""
+
 	def __init__(self, pritext, sectext='', checktext1='', checktext2='',
 				 on_response_ok=None, on_response_cancel=None, is_modal=True):
 		self.user_response_ok = on_response_ok
@@ -1560,7 +1623,10 @@ class ConfirmationDialogDubbleCheck(ConfirmationDialog):
 		return [is_checked_1, is_checked_2]
 
 class FTOverwriteConfirmationDialog(ConfirmationDialog):
-	'''HIG compliant confirmation dialog to overwrite or resume a file transfert'''
+	"""
+	HIG compliant confirmation dialog to overwrite or resume a file transfert
+	"""
+
 	def __init__(self, pritext, sectext='', propose_resume=True,
 				 on_response=None):
 		HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, gtk.BUTTONS_CANCEL,
@@ -1597,7 +1663,10 @@ class FTOverwriteConfirmationDialog(ConfirmationDialog):
 		self.destroy()
 
 class CommonInputDialog:
-	'''Common Class for Input dialogs'''
+	"""
+	Common Class for Input dialogs
+	"""
+	
 	def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler):
 		self.dialog = self.xml.get_widget('input_dialog')
 		label = self.xml.get_widget('label')
@@ -1633,9 +1702,12 @@ class CommonInputDialog:
 		self.dialog.destroy()
 
 class InputDialog(CommonInputDialog):
-	'''Class for Input dialog'''
+	"""
+	Class for Input dialog
+	"""
+
 	def __init__(self, title, label_str, input_str=None, is_modal=True,
-	ok_handler=None, cancel_handler=None):
+			ok_handler=None, cancel_handler=None):
 		self.xml = gtkgui_helpers.get_glade('input_dialog.glade')
 		CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler,
 			cancel_handler)
@@ -1651,9 +1723,12 @@ class InputDialog(CommonInputDialog):
 		return self.input_entry.get_text().decode('utf-8')
 
 class InputDialogCheck(InputDialog):
-	'''Class for Input dialog'''
+	"""
+	Class for Input dialog
+	"""
+
 	def __init__(self, title, label_str, checktext='', input_str=None,
-	is_modal=True, ok_handler=None, cancel_handler=None):
+			is_modal=True, ok_handler=None, cancel_handler=None):
 		self.xml = gtkgui_helpers.get_glade('input_dialog.glade')
 		InputDialog.__init__(self, title, label_str, input_str=input_str,
 			is_modal=is_modal, ok_handler=ok_handler,
@@ -1683,7 +1758,9 @@ class InputDialogCheck(InputDialog):
 		return self.input_entry.get_text().decode('utf-8')
 
 	def is_checked(self):
-		''' Get active state of the checkbutton '''
+		"""
+		Get active state of the checkbutton
+		"""
 		try:
 			return self.checkbutton.get_active()
 		except Exception:
@@ -1691,7 +1768,10 @@ class InputDialogCheck(InputDialog):
 			return False
 
 class ChangeNickDialog(InputDialogCheck):
-	'''Class for changing room nickname in case of conflict'''
+	"""
+	Class for changing room nickname in case of conflict
+	"""
+
 	def __init__(self, account, room_jid, title, prompt, check_text=None):
 		InputDialogCheck.__init__(self, title, '', checktext=check_text,
 			input_str='', is_modal=True, ok_handler=None, cancel_handler=None)
@@ -1773,7 +1853,10 @@ class ChangeNickDialog(InputDialogCheck):
 			self.room_queue.append((account, room_jid, prompt))
 
 class InputTextDialog(CommonInputDialog):
-	'''Class for multilines Input dialog (more place than InputDialog)'''
+	"""
+	Class for multilines Input dialog (more place than InputDialog)
+	"""
+
 	def __init__(self, title, label_str, input_str=None, is_modal=True,
 				 ok_handler=None, cancel_handler=None):
 		self.xml = gtkgui_helpers.get_glade('input_text_dialog.glade')
@@ -1790,7 +1873,10 @@ class InputTextDialog(CommonInputDialog):
 		return self.input_buffer.get_text(start_iter, end_iter).decode('utf-8')
 
 class DubbleInputDialog:
-	'''Class for Dubble Input dialog'''
+	"""
+	Class for Dubble Input dialog
+	"""
+
 	def __init__(self, title, label_str1, label_str2, input_str1=None,
 				 input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None):
 		self.xml = gtkgui_helpers.get_glade('dubbleinput_dialog.glade')
@@ -1876,7 +1962,9 @@ class SubscriptionRequestWindow:
 		self.window.destroy()
 
 	def on_authorize_button_clicked(self, widget):
-		'''accept the request'''
+		"""
+		Accept the request
+		"""
 		gajim.connections[self.account].send_authorization(self.jid)
 		self.window.destroy()
 		contact = gajim.contacts.get_contact(self.account, self.jid)
@@ -1884,7 +1972,9 @@ class SubscriptionRequestWindow:
 			AddNewContactWindow(self.account, self.jid, self.user_nick)
 
 	def on_contact_info_activate(self, widget):
-		'''ask vcard'''
+		"""
+		Ask vcard
+		"""
 		if self.jid in gajim.interface.instances[self.account]['infos']:
 			gajim.interface.instances[self.account]['infos'][self.jid].window.present()
 		else:
@@ -1896,11 +1986,15 @@ class SubscriptionRequestWindow:
 				 get_widget('information_notebook').remove_page(0)
 
 	def on_start_chat_activate(self, widget):
-		'''open chat'''
+		"""
+		Open chat
+		"""
 		gajim.interface.new_chat_from_jid(self.account, self.jid)
 
 	def on_deny_button_clicked(self, widget):
-		'''refuse the request'''
+		"""
+		Refuse the request
+		"""
 		gajim.connections[self.account].refuse_authorization(self.jid)
 		contact = gajim.contacts.get_contact(self.account, self.jid)
 		if contact and _('Not in Roster') in contact.get_shown_groups():
@@ -1908,7 +2002,9 @@ class SubscriptionRequestWindow:
 		self.window.destroy()
 
 	def on_actions_button_clicked(self, widget):
-		'''popup action menu'''
+		"""
+		Popup action menu
+		"""
 		menu = self.prepare_popup_menu()
 		menu.show_all()
 		gtkgui_helpers.popup_emoticons_under_button(menu, widget, self.window.window)
@@ -1916,11 +2012,12 @@ class SubscriptionRequestWindow:
 
 class JoinGroupchatWindow:
 	def __init__(self, account=None, room_jid='', nick='', password='',
-				 automatic=False):
-		'''automatic is a dict like {'invities': []}
-		If automatic is not empty, this means room must be automaticaly configured
-		and when done, invities must be automatically invited'''
-
+			automatic=False):
+		"""
+		Automatic is a dict like {'invities': []}. If automatic is not empty,
+		this means room must be automaticaly configured and when done, invities
+		must be automatically invited
+		"""
 		if account:
 			if room_jid != '' and room_jid in gajim.gc_connected[account] and\
 		   gajim.gc_connected[account][room_jid]:
@@ -2007,10 +2104,13 @@ class JoinGroupchatWindow:
 		self.window.show_all()
 
 	def on_join_groupchat_window_destroy(self, widget):
-		'''close window'''
+		"""
+		Close window
+		"""
 		if self.account and 'join_gc' in gajim.interface.instances[self.account]:
 			# remove us from open windows
 			del gajim.interface.instances[self.account]['join_gc']
+			gajim.interface.roster.window.present()
 
 	def on_join_groupchat_window_key_press_event(self, widget, event):
 		if event.keyval == gtk.keysyms.Escape: # ESCAPE
@@ -2039,7 +2139,9 @@ class JoinGroupchatWindow:
 		self._room_jid_entry.set_text(room_jid)
 
 	def on_cancel_button_clicked(self, widget):
-		'''When Cancel button is clicked'''
+		"""
+		When Cancel button is clicked
+		"""
 		self.window.destroy()
 
 	def on_bookmark_checkbutton_toggled(self, widget):
@@ -2050,7 +2152,9 @@ class JoinGroupchatWindow:
 			auto_join_checkbutton.set_sensitive(False)
 
 	def on_join_button_clicked(self, widget):
-		'''When Join button is clicked'''
+		"""
+		When Join button is clicked
+		"""
 		if not self.account:
 			ErrorDialog(_('Invalid Account'),
 				_('You have to choose an account from which you want to join the '
@@ -2138,7 +2242,9 @@ class SynchroniseSelectAccountDialog:
 			self.window.destroy()
 
 	def init_accounts(self):
-		'''initialize listStore with existing accounts'''
+		"""
+		Initialize listStore with existing accounts
+		"""
 		model = self.accounts_treeview.get_model()
 		model.clear()
 		for remote_account in gajim.connections:
@@ -2204,7 +2310,9 @@ class SynchroniseSelectContactsDialog:
 			self.window.destroy()
 
 	def init_contacts(self):
-		'''initialize listStore with existing accounts'''
+		"""
+		Initialize listStore with existing accounts
+		"""
 		model = self.contacts_treeview.get_model()
 		model.clear()
 
@@ -2267,7 +2375,9 @@ class NewChatDialog(InputDialog):
 		self.dialog.show_all()
 
 	def new_chat_response(self, jid):
-		''' called when ok button is clicked '''
+		"""
+		Called when ok button is clicked
+		"""
 		if gajim.connections[self.account].connected <= 1:
 			#if offline or connecting
 			ErrorDialog(_('Connection not available'),
@@ -2351,9 +2461,7 @@ class PopupNotificationWindow:
 
 		# default image
 		if not path_to_image:
-			path_to_image = os.path.abspath(
-				os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-							 'chat_msg_recv.png')) # img to display
+			path_to_image = gtkgui_helpers.get_icon_path('gajim-chat_msg_recv', 48)
 
 		if event_type == _('Contact Signed In'):
 			bg_color = 'limegreen'
@@ -2433,10 +2541,10 @@ class PopupNotificationWindow:
 		self.adjust_height_and_move_popup_notification_windows()
 
 class SingleMessageWindow:
-	'''SingleMessageWindow can send or show a received
-	singled message depending on action argument which can be 'send'
-	or 'receive'.
-	'''
+	"""
+	SingleMessageWindow can send or show a received singled message depending on
+	action argument which can be 'send' or 'receive'
+	"""
 	# Keep a reference on windows so garbage collector don't restroy them
 	instances = []
 	def __init__(self, account, to='', action='', from_whom='', subject='',
@@ -2739,14 +2847,23 @@ class XMLConsoleWindow:
 		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.tagInPresence = buffer_.create_tag('incoming_presence')
+		self.tagInPresence.set_property('foreground', color)
+		self.tagInMessage = buffer_.create_tag('incoming_message')
+		self.tagInMessage.set_property('foreground', color)
+		self.tagInIq = buffer_.create_tag('incoming_iq')
+		self.tagInIq.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.tagOutPresence = buffer_.create_tag('outgoing_presence')
+		self.tagOutPresence.set_property('foreground', color)
+		self.tagOutMessage = buffer_.create_tag('outgoing_message')
+		self.tagOutMessage.set_property('foreground', color)
+		self.tagOutIq = buffer_.create_tag('outgoing_iq')
+		self.tagOutIq.set_property('foreground', color)
+		buffer_.create_tag('') # Default tag
 
 		self.enabled = False
 
@@ -2774,6 +2891,35 @@ class XMLConsoleWindow:
 	def on_enable_checkbutton_toggled(self, widget):
 		self.enabled = widget.get_active()
 
+	def on_in_stanza_checkbutton_toggled(self, widget):
+		active = widget.get_active()
+		self.tagIn.set_property('invisible', active)
+		self.tagInPresence.set_property('invisible', active)
+		self.tagInMessage.set_property('invisible', active)
+		self.tagInIq.set_property('invisible', active)
+
+	def on_presence_stanza_checkbutton_toggled(self, widget):
+		active = widget.get_active()
+		self.tagInPresence.set_property('invisible', active)
+		self.tagOutPresence.set_property('invisible', active)
+
+	def on_out_stanza_checkbutton_toggled(self, widget):
+		active = widget.get_active()
+		self.tagOut.set_property('invisible', active)
+		self.tagOutPresence.set_property('invisible', active)
+		self.tagOutMessage.set_property('invisible', active)
+		self.tagOutIq.set_property('invisible', active)
+
+	def on_message_stanza_checkbutton_toggled(self, widget):
+		active = widget.get_active()
+		self.tagInMessage.set_property('invisible', active)
+		self.tagOutMessage.set_property('invisible', active)
+
+	def on_iq_stanza_checkbutton_toggled(self, widget):
+		active = widget.get_active()
+		self.tagInIq.set_property('invisible', active)
+		self.tagOutIq.set_property('invisible', active)
+
 	def scroll_to_end(self, ):
 		parent = self.stanzas_log_textview.get_parent()
 		buffer_ = self.stanzas_log_textview.get_buffer()
@@ -2800,15 +2946,29 @@ class XMLConsoleWindow:
 		if end_rect.y <= (visible_rect.y + visible_rect.height):
 			at_the_end = True
 		end_iter = buffer.get_end_iter()
+
+		type_ = ''
+		if stanza[1:9] == 'presence':
+			type_ = 'presence'
+		elif stanza[1:8] == 'message':
+			type_ = 'message'
+		elif stanza[1:3] == 'iq':
+			type_ = 'iq'
+
+		if type_:
+			type_ = kind + '_'  + type_
+		else:
+			type_ = kind # 'incoming' or 'outgoing'
+
 		if kind == 'incoming':
 			buffer.insert_with_tags_by_name(end_iter, '<!-- In -->\n',
-											'in_comment')
+				type_)
 		elif kind == 'outgoing':
 			buffer.insert_with_tags_by_name(end_iter, '<!-- Out -->\n',
-											'out_comment')
+				type_)
 		end_iter = buffer.get_end_iter()
-		buffer.insert_with_tags_by_name(end_iter, stanza.replace('><', '>\n<') + \
-										'\n\n', kind)
+		buffer.insert_with_tags_by_name(end_iter, stanza.replace('><', '>\n<') +\
+			'\n\n', type_)
 		if at_the_end:
 			gobject.idle_add(self.scroll_to_end)
 
@@ -2843,10 +3003,16 @@ class XMLConsoleWindow:
 			# it's expanded!!
 			self.input_textview.grab_focus()
 
+#Action that can be done with an incoming list of contacts
+TRANSLATED_ACTION = {'add': _('add'), 'modify': _('modify'),
+	'remove': _('remove')}
 class RosterItemExchangeWindow:
-	''' Windows used when someone send you a exchange contact suggestion '''
+	"""
+	Windows used when someone send you a exchange contact suggestion
+	"""
+
 	def __init__(self, account, action, exchange_list, jid_from,
-	message_body=None):
+			message_body=None):
 		self.account = account
 		self.action = action
 		self.exchange_list = exchange_list
@@ -2866,12 +3032,13 @@ class RosterItemExchangeWindow:
 
 		# Set labels
 		# self.action can be 'add', 'modify' or 'remove'
-		self.type_label.set_label(\
-			_('<b>%s</b> would like you to <b>%s</b> some contacts in your '
-			'roster.') % (jid_from, _(self.action)))
+		self.type_label.set_label(
+			_('<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts '
+				'in your roster.') % {'jid': jid_from,
+				'action': TRANSLATED_ACTION[self.action]})
 		if message_body:
-			buffer = self.body_textview.get_buffer()
-			buffer.set_text(self.message_body)
+			buffer_ = self.body_textview.get_buffer()
+			buffer_.set_text(self.message_body)
 		else:
 			self.body_scrolledwindow.hide()
 		# Treeview
@@ -2924,8 +3091,8 @@ class RosterItemExchangeWindow:
 						groups = groups + group + ', '
 				if not is_in_roster:
 					show_dialog = True
-					iter = model.append()
-					model.set(iter, 0, True, 1, jid, 2, name, 3, groups)
+					iter_ = model.append()
+					model.set(iter_, 0, True, 1, jid, 2, name, 3, groups)
 
 			# Change label for accept_button to action name instead of 'OK'.
 			self.accept_button_label.set_label(_('Add'))
@@ -2955,8 +3122,8 @@ class RosterItemExchangeWindow:
 						groups = groups + group + ', '
 				if not is_right and is_in_roster:
 					show_dialog = True
-					iter = model.append()
-					model.set(iter, 0, True, 1, jid, 2, name, 3, groups)
+					iter_ = model.append()
+					model.set(iter_, 0, True, 1, jid, 2, name, 3, groups)
 
 			# Change label for accept_button to action name instead of 'OK'.
 			self.accept_button_label.set_label(_('Modify'))
@@ -2979,8 +3146,8 @@ class RosterItemExchangeWindow:
 						groups = groups + group + ', '
 				if is_in_roster:
 					show_dialog = True
-					iter = model.append()
-					model.set(iter, 0, True, 1, jid, 2, name, 3, groups)
+					iter_ = model.append()
+					model.set(iter_, 0, True, 1, jid, 2, name, 3, groups)
 
 			# Change label for accept_button to action name instead of 'OK'.
 			self.accept_button_label.set_label(_('Delete'))
@@ -2991,49 +3158,49 @@ class RosterItemExchangeWindow:
 
 	def toggled_callback(self, cell, path):
 		model = self.items_list_treeview.get_model()
-		iter = model.get_iter(path)
-		model[iter][0] = not cell.get_active()
+		iter_ = model.get_iter(path)
+		model[iter_][0] = not cell.get_active()
 
 	def on_accept_button_clicked(self, widget):
 		model = self.items_list_treeview.get_model()
-		iter = model.get_iter_root()
+		iter_ = model.get_iter_root()
 		if self.action == 'add':
 			a = 0
-			while iter:
-				if model[iter][0]:
+			while iter_:
+				if model[iter_][0]:
 					a+=1
 					# it is selected
-					#remote_jid = model[iter][1].decode('utf-8')
+					#remote_jid = model[iter_][1].decode('utf-8')
 					message = _('%s suggested me to add you in my roster.'
 						% self.jid_from)
 					# keep same groups and same nickname
-					groups = model[iter][3].split(', ')
+					groups = model[iter_][3].split(', ')
 					if groups == ['']:
 						groups = []
-					jid = model[iter][1].decode('utf-8')
+					jid = model[iter_][1].decode('utf-8')
 					if gajim.jid_is_transport(self.jid_from):
 						gajim.connections[self.account].automatically_added.append(
 							jid)
 					gajim.interface.roster.req_sub(self, jid, message,
-						self.account, groups=groups, nickname=model[iter][2],
+						self.account, groups=groups, nickname=model[iter_][2],
 						auto_auth=True)
-				iter = model.iter_next(iter)
-			InformationDialog('Added  %s contacts' % str(a))
+				iter_ = model.iter_next(iter_)
+			InformationDialog(_('Added  %s contacts') % str(a))
 		elif self.action == 'modify':
 			a = 0
-			while iter:
-				if model[iter][0]:
+			while iter_:
+				if model[iter_][0]:
 					a+=1
 					# it is selected
-					jid = model[iter][1].decode('utf-8')
+					jid = model[iter_][1].decode('utf-8')
 					# keep same groups and same nickname
-					groups = model[iter][3].split(', ')
+					groups = model[iter_][3].split(', ')
 					if groups == ['']:
 						groups = []
 					for u in gajim.contacts.get_contact(self.account, jid):
-						u.name = model[iter][2]
+						u.name = model[iter_][2]
 					gajim.connections[self.account].update_contact(jid,
-						model[iter][2], groups)
+						model[iter_][2], groups)
 					self.draw_contact(jid, account)
 					# Update opened chat
 					ctrl = gajim.interface.msg_win_mgr.get_control(jid, self.account)
@@ -3043,19 +3210,19 @@ class RosterItemExchangeWindow:
 							self.account)
 						win.redraw_tab(ctrl)
 						win.show_title()
-				iter = model.iter_next(iter)
+				iter_ = model.iter_next(iter_)
 		elif self.action == 'delete':
 			a = 0
-			while iter:
-				if model[iter][0]:
+			while iter_:
+				if model[iter_][0]:
 					a+=1
 					# it is selected
-					jid = model[iter][1].decode('utf-8')
+					jid = model[iter_][1].decode('utf-8')
 					gajim.connections[self.account].unsubscribe(jid)
 					gajim.interface.roster.remove_contact(jid, self.account)
 					gajim.contacts.remove_jid(self.account, jid)
-				iter = model.iter_next(iter)
-			InformationDialog('Removed  %s contacts' % str(a))
+				iter_ = model.iter_next(iter_)
+			InformationDialog(_('Removed  %s contacts') % str(a))
 		self.window.destroy()
 
 	def on_cancel_button_clicked(self, widget):
@@ -3063,8 +3230,10 @@ class RosterItemExchangeWindow:
 
 
 class PrivacyListWindow:
-	'''Window that is used for creating NEW or EDITING already there privacy
-	lists'''
+	"""
+	Window that is used for creating NEW or EDITING already there privacy lists
+	"""
+
 	def __init__(self, account, privacy_list_name, action):
 		'''action is 'EDIT' or 'NEW' depending on if we create a new priv list
 		or edit an already existing one'''
@@ -3076,6 +3245,8 @@ class PrivacyListWindow:
 		self.global_rules = {}
 		self.list_of_groups = {}
 
+		self.max_order = 0
+
 		# Default Edit Values
 		self.edit_rule_type = 'jid'
 		self.allow_deny = 'allow'
@@ -3171,6 +3342,8 @@ class PrivacyListWindow:
 			else:
 				text_item = _('Order: %(order)s, action: %(action)s') % \
 					{'order': rule['order'], 'action': rule['action']}
+			if int(rule['order']) > self.max_order:
+				self.max_order = int(rule['order'])
 			self.global_rules[text_item] = rule
 			self.list_of_rules_combobox.append_text(text_item)
 		if len(rules) == 0:
@@ -3318,7 +3491,7 @@ class PrivacyListWindow:
 		self.edit_view_status_checkbutton.set_active(False)
 		self.edit_send_status_checkbutton.set_active(False)
 		self.edit_all_checkbutton.set_active(False)
-		self.edit_order_spinbutton.set_value(1)
+		self.edit_order_spinbutton.set_value(self.max_order + 1)
 		self.edit_type_group_combobox.set_active(0)
 		self.edit_type_subscription_combobox.set_active(0)
 		self.add_edit_rule_label.set_label(
@@ -3361,6 +3534,8 @@ class PrivacyListWindow:
 	def on_save_rule_button_clicked(self, widget):
 		tags=[]
 		current_tags = self.get_current_tags()
+		if int(current_tags['order']) > self.max_order:
+			self.max_order = int(current_tags['order'])
 		if self.active_rule == '':
 			tags.append(current_tags)
 
@@ -3396,9 +3571,10 @@ class PrivacyListWindow:
 		self.window.destroy()
 
 class PrivacyListsWindow:
-	'''Window that is the main window for Privacy Lists;
-	we can list there the privacy lists and ask to create a new one
-	or edit an already there one'''
+	"""
+	Window that is the main window for Privacy Lists; we can list there the
+	privacy lists and ask to create a new one or edit an already there one
+	"""
 	def __init__(self, account):
 		self.account = account
 		self.privacy_lists_save = []
@@ -3555,9 +3731,10 @@ class InvitationReceivedDialog:
 
 class ProgressDialog:
 	def __init__(self, title_text, during_text, messages_queue):
-		'''during text is what to show during the procedure,
-		messages_queue has the message to show
-		in the textview'''
+		"""
+		During text is what to show during the procedure, messages_queue has the
+		message to show in the textview
+		"""
 		self.xml = gtkgui_helpers.get_glade('progress_dialog.glade')
 		self.dialog = self.xml.get_widget('progress_dialog')
 		self.label = self.xml.get_widget('label')
@@ -3584,10 +3761,14 @@ class ProgressDialog:
 
 class SoundChooserDialog(FileChooserDialog):
 	def __init__(self, path_to_snd_file='', on_response_ok=None,
-				 on_response_cancel=None):
-		'''optionally accepts path_to_snd_file so it has that as selected'''
+			on_response_cancel=None):
+		"""
+		Optionally accepts path_to_snd_file so it has that as selected
+		"""
 		def on_ok(widget, callback):
-			'''check if file exists and call callback'''
+			"""
+			Check if file exists and call callback
+			"""
 			path_to_snd_file = self.get_filename()
 			path_to_snd_file = gtkgui_helpers.decode_filechooser_file_paths(
 				(path_to_snd_file,))[0]
@@ -3623,8 +3804,10 @@ class SoundChooserDialog(FileChooserDialog):
 
 class ImageChooserDialog(FileChooserDialog):
 	def __init__(self, path_to_file='', on_response_ok=None,
-				 on_response_cancel=None):
-		'''optionally accepts path_to_snd_file so it has that as selected'''
+			on_response_cancel=None):
+		"""
+		Optionally accepts path_to_snd_file so it has that as selected
+		"""
 		def on_ok(widget, callback):
 			'''check if file exists and call callback'''
 			path_to_file = self.get_filename()
@@ -3715,8 +3898,10 @@ class AvatarChooserDialog(ImageChooserDialog):
 
 class AddSpecialNotificationDialog:
 	def __init__(self, jid):
-		'''jid is the jid for which we want to add special notification
-		(sound and notification popups)'''
+		"""
+		jid is the jid for which we want to add special notification (sound and
+		notification popups)
+		"""
 		self.xml = gtkgui_helpers.get_glade('add_special_notification_window.glade')
 		self.window = self.xml.get_widget('add_special_notification_window')
 		self.condition_combobox = self.xml.get_widget('condition_combobox')
@@ -3836,7 +4021,9 @@ class AdvancedNotificationsWindow:
 		self.window.show_all()
 
 	def initiate_rule_state(self):
-		'''Set values for all widgets'''
+		"""
+		Set values for all widgets
+		"""
 		if self.active_num < 0:
 			return
 		# event
@@ -4227,8 +4414,10 @@ class TransformChatToMUC:
 	# Keep a reference on windows so garbage collector don't restroy them
 	instances = []
 	def __init__(self, account, jids, preselected=None):
-		'''This window is used to trasform a one-to-one chat to a MUC.
-		We do 2 things: first select the server and then make a guests list.'''
+		"""
+		This window is used to trasform a one-to-one chat to a MUC. We do 2
+		things: first select the server and then make a guests list
+		"""
 
 		self.instances.append(self)
 		self.account = account
@@ -4379,7 +4568,9 @@ class DataFormWindow(Dialog):
 		self.destroy()
 
 class ESessionInfoWindow:
-	'''Class for displaying information about a XEP-0116 encrypted session'''
+	"""
+	Class for displaying information about a XEP-0116 encrypted session
+	"""
 	def __init__(self, session):
 		self.session = session
 
@@ -4397,43 +4588,37 @@ class ESessionInfoWindow:
 
 	def update_info(self):
 		labeltext = _('''Your chat session with <b>%(jid)s</b> is encrypted.\n\nThis session's Short Authentication String is <b>%(sas)s</b>.''') % {'jid': self.session.jid, 'sas': self.session.sas}
-		dir_ = os.path.join(gajim.DATA_DIR, 'pixmaps')
 
 		if self.session.verified_identity:
 			labeltext += '\n\n' + _('''You have already verified this contact's identity.''')
-			security_image = 'security-high-big.png'
+			security_image = 'gajim-security_high'
 			if self.session.control:
 				self.session.control._show_lock_image(True, 'E2E', True,
-													  self.session.is_loggable(), True)
+					self.session.is_loggable(), True)
 
 			verification_status = _('''Contact's identity verified''')
 			self.window.set_title(verification_status)
 			self.xml.get_widget('verification_status_label').set_markup(
-				'<b><span size="x-large">' +
-				verification_status +
-				'</span></b>')
+				'<b><span size="x-large">%s</span></b>' % verification_status)
 
 			self.xml.get_widget('dialog-action_area1').set_no_show_all(True)
 			self.button_label.set_text(_('Verify again...'))
 		else:
 			if self.session.control:
 				self.session.control._show_lock_image(True, 'E2E', True,
-													  self.session.is_loggable(), False)
+					self.session.is_loggable(), False)
 			labeltext += '\n\n' + _('''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.''')
-			security_image = 'security-low-big.png'
+			security_image = 'gajim-security_low'
 
 			verification_status = _('''Contact's identity NOT verified''')
 			self.window.set_title(verification_status)
 			self.xml.get_widget('verification_status_label').set_markup(
-				'<b><span size="x-large">' +
-				verification_status +
-				'</span></b>')
+				'<b><span size="x-large">%s</span></b>' % verification_status)
 
 			self.button_label.set_text(_('Verify...'))
 
-		path = os.path.join(dir_, security_image)
-		filename = os.path.abspath(path)
-		self.security_image.set_from_file(filename)
+		path = gtkgui_helpers.get_icon_path(security_image, 32)
+		self.security_image.set_from_file(path)
 
 		self.xml.get_widget('info_display').set_markup(labeltext)
 
@@ -4458,7 +4643,9 @@ class ESessionInfoWindow:
 		YesNoDialog(pritext, sectext, on_response_yes=on_yes, on_response_no=on_no)
 
 class GPGInfoWindow:
-	'''Class for displaying information about a XEP-0116 encrypted session'''
+	"""
+	Class for displaying information about a XEP-0116 encrypted session
+	"""
 	def __init__(self, control):
 		xml = gtkgui_helpers.get_glade('esession_info_window.glade')
 		security_image = xml.get_widget('security_image')
@@ -4477,13 +4664,13 @@ class GPGInfoWindow:
 			verification_status = _('''Contact's identity NOT verified''')
 			info = _('The contact\'s key (%s) <b>does not match</b> the key '
 					 'assigned in Gajim.') % keyID[:8]
-			image = 'security-low-big.png'
+			image = 'gajim-security_low'
 		elif not keyID:
 			# No key assigned nor a key is used by remote contact
 			verification_status = _('No GPG key assigned')
 			info = _('No GPG key is assigned to this contact. So you cannot '
 					 'encrypt messages.')
-			image = 'security-low-big.png'
+			image = 'gajim-security_low'
 		else:
 			error = gajim.connections[account].gpg.encrypt('test', [keyID])[1]
 			if error:
@@ -4491,21 +4678,19 @@ class GPGInfoWindow:
 				info = _('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.')
-				image = 'security-low-big.png'
+				image = 'gajim-security_low'
 			else:
 				verification_status = _('''Contact's identity verified''')
 				info = _('GPG Key is assigned to this contact, and you trust his '
 						 'key, so messages will be encrypted.')
-				image = 'security-high-big.png'
+				image = 'gajim-security_high'
 
 		status_label.set_markup('<b><span size="x-large">%s</span></b>' % \
 								verification_status)
 		info_label.set_markup(info)
 
-		dir_ = os.path.join(gajim.DATA_DIR, 'pixmaps')
-		path = os.path.join(dir_, image)
-		filename = os.path.abspath(path)
-		security_image.set_from_file(filename)
+		path = gtkgui_helpers.get_icon_path(image, 32)
+		security_image.set_from_file(path)
 
 		xml.signal_autoconnect(self)
 		self.window.show_all()
@@ -4606,11 +4791,13 @@ class VoIPCallReceivedDialog(object):
 					contact = gajim.contacts.get_contact(self.account, jid)
 				if not contact:
 					return
-				ctrl = gajim.interface.new_chat(contact, self.account)
+				ctrl = gajim.interface.new_chat(contact, self.account, resource)
 			# Chat control opened, update content's status
-			if session.get_content('audio'):
+			audio = session.get_content('audio')
+			video = session.get_content('video')
+			if audio and not audio.negotiated:
 				ctrl.set_audio_state('connecting', self.sid)
-			if session.get_content('video'):
+			if video and not video.negotiated:
 				ctrl.set_video_state('connecting', self.sid)
 			# Now, accept the content/sessions.
 			# This should be done after the chat control is running
diff --git a/src/disco.py b/src/disco.py
index 0d3621f13..1526ecd16 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -73,44 +73,44 @@ def _gen_agent_type_info():
 		(0, 0):							(None, None),
 
 		# Jabber server
-		('server', 'im'):				(ToplevelAgentBrowser, 'jabber.png'),
-		('services', 'jabber'):		(ToplevelAgentBrowser, 'jabber.png'),
-		('hierarchy', 'branch'):	(AgentBrowser, 'jabber.png'),
+		('server', 'im'):				(ToplevelAgentBrowser, 'jabber'),
+		('services', 'jabber'):		(ToplevelAgentBrowser, 'jabber'),
+		('hierarchy', 'branch'):	(AgentBrowser, 'jabber'),
 
 		# Services
-		('conference', 'text'):		(MucBrowser, 'conference.png'),
-		('headline', 'rss'):			(AgentBrowser, 'rss.png'),
-		('headline', 'weather'):	(False, 'weather.png'),
-		('gateway', 'weather'):		(False, 'weather.png'),
-		('_jid', 'weather'):			(False, 'weather.png'),
-		('gateway', 'sip'):			(False, 'sip.png'),
-		('directory', 'user'):		(None, 'jud.png'),
-		('pubsub', 'generic'):		(PubSubBrowser, 'pubsub.png'),
-		('pubsub', 'service'):		(PubSubBrowser, 'pubsub.png'),
-		('proxy', 'bytestreams'):	(None, 'bytestreams.png'), # Socks5 FT proxy
-		('headline', 'newmail'):	(ToplevelAgentBrowser, 'mail.png'),
+		('conference', 'text'):		(MucBrowser, 'conference'),
+		('headline', 'rss'):			(AgentBrowser, 'rss'),
+		('headline', 'weather'):	(False, 'weather'),
+		('gateway', 'weather'):		(False, 'weather'),
+		('_jid', 'weather'):			(False, 'weather'),
+		('gateway', 'sip'):			(False, 'sip'),
+		('directory', 'user'):		(None, 'jud'),
+		('pubsub', 'generic'):		(PubSubBrowser, 'pubsub'),
+		('pubsub', 'service'):		(PubSubBrowser, 'pubsub'),
+		('proxy', 'bytestreams'):	(None, 'bytestreams'), # Socks5 FT proxy
+		('headline', 'newmail'):	(ToplevelAgentBrowser, 'mail'),
 
 		# Transports
-		('conference', 'irc'):		(ToplevelAgentBrowser, 'irc.png'),
-		('_jid', 'irc'):				(False, 'irc.png'),
-		('gateway', 'aim'):			(False, 'aim.png'),
-		('_jid', 'aim'):				(False, 'aim.png'),
-		('gateway', 'gadu-gadu'):	(False, 'gadu-gadu.png'),
-		('_jid', 'gadugadu'):		(False, 'gadu-gadu.png'),
-		('gateway', 'http-ws'):		(False, 'http-ws.png'),
-		('gateway', 'icq'):			(False, 'icq.png'),
-		('_jid', 'icq'):				(False, 'icq.png'),
-		('gateway', 'msn'):			(False, 'msn.png'),
-		('_jid', 'msn'):				(False, 'msn.png'),
-		('gateway', 'sms'):			(False, 'sms.png'),
-		('_jid', 'sms'):				(False, 'sms.png'),
-		('gateway', 'smtp'):			(False, 'mail.png'),
-		('gateway', 'yahoo'):		(False, 'yahoo.png'),
-		('_jid', 'yahoo'):			(False, 'yahoo.png'),
-		('gateway', 'mrim'):			(False, 'mrim.png'),
-		('_jid', 'mrim'):				(False, 'mrim.png'),
-		('gateway', 'facebook'):	(False, 'facebook.png'),
-		('_jid', 'facebook'):		(False, 'facebook.png'),
+		('conference', 'irc'):		(ToplevelAgentBrowser, 'irc'),
+		('_jid', 'irc'):				(False, 'irc'),
+		('gateway', 'aim'):			(False, 'aim'),
+		('_jid', 'aim'):				(False, 'aim'),
+		('gateway', 'gadu-gadu'):	(False, 'gadu-gadu'),
+		('_jid', 'gadugadu'):		(False, 'gadu-gadu'),
+		('gateway', 'http-ws'):		(False, 'http-ws'),
+		('gateway', 'icq'):			(False, 'icq'),
+		('_jid', 'icq'):				(False, 'icq'),
+		('gateway', 'msn'):			(False, 'msn'),
+		('_jid', 'msn'):				(False, 'msn'),
+		('gateway', 'sms'):			(False, 'sms'),
+		('_jid', 'sms'):				(False, 'sms'),
+		('gateway', 'smtp'):			(False, 'mail'),
+		('gateway', 'yahoo'):		(False, 'yahoo'),
+		('_jid', 'yahoo'):			(False, 'yahoo'),
+		('gateway', 'mrim'):			(False, 'mrim'),
+		('_jid', 'mrim'):				(False, 'mrim'),
+		('gateway', 'facebook'):	(False, 'facebook'),
+		('_jid', 'facebook'):		(False, 'facebook'),
 	}
 
 # Category type to "human-readable" description string, and sort priority
@@ -124,16 +124,21 @@ _cat_to_descr = {
 
 
 class CacheDictionary:
-	'''A dictionary that keeps items around for only a specific time.
-	Lifetime is in minutes. Getrefresh specifies whether to refresh when
-	an item is merely accessed instead of set aswell.'''
+	"""
+	A dictionary that keeps items around for only a specific time.  Lifetime is
+	in minutes. Getrefresh specifies whether to refresh when an item is merely
+	accessed instead of set aswell
+	"""
+
 	def __init__(self, lifetime, getrefresh = True):
 		self.lifetime = lifetime * 1000 * 60
 		self.getrefresh = getrefresh
 		self.cache = {}
 
 	class CacheItem:
-		'''An object to store cache items and their timeouts.'''
+		"""
+		An object to store cache items and their timeouts
+		"""
 		def __init__(self, value):
 			self.value = value
 			self.source = None
@@ -149,13 +154,17 @@ class CacheDictionary:
 			del self.cache[key]
 
 	def _expire_timeout(self, key):
-		'''The timeout has expired, remove the object.'''
+		"""
+		The timeout has expired, remove the object
+		"""
 		if key in self.cache:
 			del self.cache[key]
 		return False
 
 	def _refresh_timeout(self, key):
-		'''The object was accessed, refresh the timeout.'''
+		"""
+		The object was accessed, refresh the timeout
+		"""
 		item = self.cache[key]
 		if item.source:
 			gobject.source_remove(item.source)
@@ -187,20 +196,25 @@ class CacheDictionary:
 _icon_cache = CacheDictionary(15)
 
 def get_agent_address(jid, node = None):
-	'''Returns an agent's address for displaying in the GUI.'''
+	"""
+	Get an agent's address for displaying in the GUI
+	"""
 	if node:
 		return '%s@%s' % (node, str(jid))
 	else:
 		return str(jid)
 
 class Closure(object):
-	'''A weak reference to a callback with arguments as an object.
+	"""
+	A weak reference to a callback with arguments as an object
 
 	Weak references to methods immediatly die, even if the object is still
 	alive. Besides a handy way to store a callback, this provides a workaround
 	that keeps a reference to the object instead.
 
-	Userargs and removeargs must be tuples.'''
+	Userargs and removeargs must be tuples.
+	"""
+
 	def __init__(self, cb, userargs = (), remove = None, removeargs = ()):
 		self.userargs = userargs
 		self.remove = remove
@@ -229,8 +243,11 @@ class Closure(object):
 
 
 class ServicesCache:
-	'''Class that caches our query results. Each connection will have it's own
-	ServiceCache instance.'''
+	"""
+	Class that caches our query results. Each connection will have it's own
+	ServiceCache instance
+	"""
+
 	def __init__(self, account):
 		self.account = account
 		self._items = CacheDictionary(0, getrefresh = False)
@@ -256,7 +273,9 @@ class ServicesCache:
 			del self._cbs[cbkey]
 
 	def get_icon(self, identities = []):
-		'''Return the icon for an agent.'''
+		"""
+		Return the icon for an agent
+		"""
 		# Grab the first identity with an icon
 		for identity in identities:
 			try:
@@ -272,19 +291,20 @@ class ServicesCache:
 			info = _agent_type_info[(0, 0)]
 			filename = info[1]
 		if not filename: # we don't have an image to show for this type
-			filename = 'jabber.png'
+			filename = 'jabber'
 		# Use the cache if possible
 		if filename in _icon_cache:
 			return _icon_cache[filename]
 		# Or load it
-		filepath = os.path.join(gajim.DATA_DIR, 'pixmaps', 'agents', filename)
-		pix = gtk.gdk.pixbuf_new_from_file(filepath)
+		pix = gtkgui_helpers.get_icon_pixmap('gajim-agent-' + filename, size=32)
 		# Store in cache
 		_icon_cache[filename] = pix
 		return pix
 
 	def get_browser(self, identities=[], features=[]):
-		'''Return the browser class for an agent.'''
+		"""
+		Return the browser class for an agent
+		"""
 		# First pass, we try to find a ToplevelAgentBrowser
 		for identity in identities:
 			try:
@@ -316,7 +336,9 @@ class ServicesCache:
 		return None
 
 	def get_info(self, jid, node, cb, force = False, nofetch = False, args = ()):
-		'''Get info for an agent.'''
+		"""
+		Get info for an agent
+		"""
 		addr = get_agent_address(jid, node)
 		# Check the cache
 		if addr in self._info:
@@ -338,7 +360,9 @@ class ServicesCache:
 			gajim.connections[self.account].discoverInfo(jid, node)
 
 	def get_items(self, jid, node, cb, force = False, nofetch = False, args = ()):
-		'''Get a list of items in an agent.'''
+		"""
+		Get a list of items in an agent
+		"""
 		addr = get_agent_address(jid, node)
 		# Check the cache
 		if addr in self._items:
@@ -360,7 +384,9 @@ class ServicesCache:
 			gajim.connections[self.account].discoverItems(jid, node)
 
 	def agent_info(self, jid, node, identities, features, data):
-		'''Callback for when we receive an agent's info.'''
+		"""
+		Callback for when we receive an agent's info
+		"""
 		addr = get_agent_address(jid, node)
 
 		# Store in cache
@@ -376,7 +402,9 @@ class ServicesCache:
 				del self._cbs[cbkey]
 
 	def agent_items(self, jid, node, items):
-		'''Callback for when we receive an agent's items.'''
+		"""
+		Callback for when we receive an agent's items
+		"""
 		addr = get_agent_address(jid, node)
 
 		# Store in cache
@@ -392,8 +420,10 @@ class ServicesCache:
 				del self._cbs[cbkey]
 
 	def agent_info_error(self, jid):
-		'''Callback for when a query fails. (even after the browse and agents
-		namespaces)'''
+		"""
+		Callback for when a query fails. Even after the browse and agents
+		namespaces
+		"""
 		addr = get_agent_address(jid)
 
 		# Call callbacks
@@ -406,8 +436,10 @@ class ServicesCache:
 				del self._cbs[cbkey]
 
 	def agent_items_error(self, jid):
-		'''Callback for when a query fails. (even after the browse and agents
-		namespaces)'''
+		"""
+		Callback for when a query fails. Even after the browse and agents
+		namespaces
+		"""
 		addr = get_agent_address(jid)
 
 		# Call callbacks
@@ -421,7 +453,10 @@ class ServicesCache:
 
 # object is needed so that @property works
 class ServiceDiscoveryWindow(object):
-	'''Class that represents the Services Discovery window.'''
+	"""
+	Class that represents the Services Discovery window
+	"""
+
 	def __init__(self, account, jid = '', node = '',
 			address_entry = False, parent = None):
 		self.account = account
@@ -510,8 +545,10 @@ _('Without a connection, you can not browse available services'))
 			self.browser.account = value
 
 	def _initial_state(self):
-		'''Set some initial state on the window. Separated in a method because
-		it's handy to use within browser's cleanup method.'''
+		"""
+		Set some initial state on the window. Separated in a method because it's
+		handy to use within browser's cleanup method
+		"""
 		self.progressbar.hide()
 		title_text = _('Service Discovery using account %s') % self.account
 		self.window.set_title(title_text)
@@ -550,7 +587,9 @@ _('Without a connection, you can not browse available services'))
 		self.banner.set_markup(markup)
 
 	def paint_banner(self):
-		'''Repaint the banner with theme color'''
+		"""
+		Repaint the banner with theme color
+		"""
 		theme = gajim.config.get('roster_theme')
 		bgcolor = gajim.config.get_per('themes', theme, 'bannerbgcolor')
 		textcolor = gajim.config.get_per('themes', theme, 'bannertextcolor')
@@ -584,10 +623,11 @@ _('Without a connection, you can not browse available services'))
 					self._on_style_set_event, set_fg, set_bg)
 
 	def _on_style_set_event(self, widget, style, *opts):
-		''' set style of widget from style class *.Frame.Eventbox
+		"""
+		Set style of widget from style class *.Frame.Eventbox
 			opts[0] == True -> set fg color
-			opts[1] == True -> set bg color	'''
-
+			opts[1] == True -> set bg color
+		"""
 		self.disconnect_style_event()
 		if opts[1]:
 			bg_color = widget.style.bg[gtk.STATE_SELECTED]
@@ -599,9 +639,11 @@ _('Without a connection, you can not browse available services'))
 		self.connect_style_event(opts[0], opts[1])
 
 	def destroy(self, chain = False):
-		'''Close the browser. This can optionally close its children and
-		propagate to the parent. This should happen on actions like register,
-		or join to kill off the entire browser chain.'''
+		"""
+		Close the browser. This can optionally close its children and propagate
+		to the parent. This should happen on actions like register, or join to
+		kill off the entire browser chain
+		"""
 		if self.dying:
 			return
 		self.dying = True
@@ -632,7 +674,9 @@ _('Without a connection, you can not browse available services'))
 			self.cache.cleanup()
 
 	def travel(self, jid, node):
-		'''Travel to an agent within the current services window.'''
+		"""
+		Travel to an agent within the current services window
+		"""
 		if self.browser:
 			self.browser.cleanup()
 			self.browser = None
@@ -649,7 +693,9 @@ _('Without a connection, you can not browse available services'))
 		self.cache.get_info(jid, node, self._travel)
 
 	def _travel(self, jid, node, identities, features, data):
-		'''Continuation of travel.'''
+		"""
+		Continuation of travel
+		"""
 		if self.dying or jid != self.jid or node != self.node:
 			return
 		if not identities:
@@ -671,7 +717,9 @@ _('This type of service does not contain any items to browse.'))
 		self.browser.browse()
 
 	def open(self, jid, node):
-		'''Open an agent. By default, this happens in a new window.'''
+		"""
+		Open an agent. By default, this happens in a new window
+		"""
 		try:
 			win = gajim.interface.instances[self.account]['disco']\
 				[get_agent_address(jid, node)]
@@ -737,10 +785,13 @@ _('This type of service does not contain any items to browse.'))
 
 
 class AgentBrowser:
-	'''Class that deals with browsing agents and appearance of the browser
-	window. This class and subclasses should basically be treated as "part"
-	of the ServiceDiscoveryWindow class, but had to be separated because this part
-	is dynamic.'''
+	"""
+	Class that deals with browsing agents and appearance of the browser window.
+	This class and subclasses should basically be treated as "part" of the
+	ServiceDiscoveryWindow class, but had to be separated because this part is
+	dynamic
+	"""
+
 	def __init__(self, account, jid, node):
 		self.account = account
 		self.jid = jid
@@ -751,20 +802,26 @@ class AgentBrowser:
 		self.active = False
 
 	def _get_agent_address(self):
-		'''Returns the agent's address for displaying in the GUI.'''
+		"""
+		Get the agent's address for displaying in the GUI
+		"""
 		return get_agent_address(self.jid, self.node)
 
 	def _set_initial_title(self):
-		'''Set the initial window title based on agent address.'''
+		"""
+		Set the initial window title based on agent address
+		"""
 		self.window.window.set_title(_('Browsing %(address)s using account '
 			'%(account)s') % {'address': self._get_agent_address(),
 			'account': self.account})
 		self.window._set_window_banner_text(self._get_agent_address())
 
 	def _create_treemodel(self):
-		'''Create the treemodel for the services treeview. When subclassing,
-		note that the first two columns should ALWAYS be of type string and
-		contain the JID and node of the item respectively.'''
+		"""
+		Create the treemodel for the services treeview. When subclassing, note
+		that the first two columns should ALWAYS be of type string and contain
+		the JID and node of the item respectively
+		"""
 		# JID, node, name, address
 		self.model = gtk.ListStore(str, str, str, str)
 		self.model.set_sort_column_id(3, gtk.SORT_ASCENDING)
@@ -792,8 +849,10 @@ class AgentBrowser:
 		self.window.services_treeview.set_headers_visible(False)
 
 	def _add_actions(self):
-		'''Add the action buttons to the buttonbox for actions the browser can
-		perform.'''
+		"""
+		Add the action buttons to the buttonbox for actions the browser can
+		perform
+		"""
 		self.browse_button = gtk.Button()
 		image = gtk.image_new_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
 		label = gtk.Label(_('_Browse'))
@@ -807,13 +866,17 @@ class AgentBrowser:
 		self.browse_button.show_all()
 
 	def _clean_actions(self):
-		'''Remove the action buttons specific to this browser.'''
+		"""
+		Remove the action buttons specific to this browser
+		"""
 		if self.browse_button:
 			self.browse_button.destroy()
 			self.browse_button = None
 
 	def _set_title(self, jid, node, identities, features, data):
-		'''Set the window title based on agent info.'''
+		"""
+		Set the window title based on agent info
+		"""
 		# Set the banner and window title
 		if 'name' in identities[0]:
 			name = identities[0]['name']
@@ -830,8 +893,10 @@ class AgentBrowser:
 		pass
 
 	def prepare_window(self, window):
-		'''Prepare the service discovery window. Called when a browser is hooked
-		up with a ServiceDiscoveryWindow instance.'''
+		"""
+		Prepare the service discovery window. Called when a browser is hooked up
+		with a ServiceDiscoveryWindow instance
+		"""
 		self.window = window
 		self.cache = window.cache
 
@@ -852,7 +917,9 @@ class AgentBrowser:
 		self.cache.get_info(self.jid, self.node, self._set_title)
 
 	def cleanup(self):
-		'''Cleanup when the window intends to switch browsers.'''
+		"""
+		Cleanup when the window intends to switch browsers
+		"""
 		self.active = False
 
 		self._clean_actions()
@@ -862,12 +929,16 @@ class AgentBrowser:
 		self.window._initial_state()
 
 	def update_theme(self):
-		'''Called when the default theme is changed.'''
+		"""
+		Called when the default theme is changed
+		"""
 		pass
 
 	def on_browse_button_clicked(self, widget = None):
-		'''When we want to browse an agent:
-		Open a new services window with a browser for the agent type.'''
+		"""
+		When we want to browse an agent: open a new services window with a
+		browser for the agent type
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if not iter_:
 			return
@@ -877,8 +948,9 @@ class AgentBrowser:
 			self.window.open(jid, node)
 
 	def update_actions(self):
-		'''When we select a row:
-		activate action buttons based on the agent's info.'''
+		"""
+		When we select a row: activate action buttons based on the agent's info
+		"""
 		if self.browse_button:
 			self.browse_button.set_sensitive(False)
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
@@ -890,7 +962,9 @@ class AgentBrowser:
 			self.cache.get_info(jid, node, self._update_actions, nofetch = True)
 
 	def _update_actions(self, jid, node, identities, features, data):
-		'''Continuation of update_actions.'''
+		"""
+		Continuation of update_actions
+		"""
 		if not identities or not self.browse_button:
 			return
 		klass = self.cache.get_browser(identities, features)
@@ -898,8 +972,10 @@ class AgentBrowser:
 			self.browse_button.set_sensitive(True)
 
 	def default_action(self):
-		'''When we double-click a row:
-		perform the default action on the selected item.'''
+		"""
+		When we double-click a row: perform the default action on the selected
+		item
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if not iter_:
 			return
@@ -909,7 +985,9 @@ class AgentBrowser:
 			self.cache.get_info(jid, node, self._default_action, nofetch = True)
 
 	def _default_action(self, jid, node, identities, features, data):
-		'''Continuation of default_action.'''
+		"""
+		Continuation of default_action
+		"""
 		if self.cache.get_browser(identities, features):
 			# Browse if we can
 			self.on_browse_button_clicked()
@@ -917,7 +995,9 @@ class AgentBrowser:
 		return False
 
 	def browse(self, force = False):
-		'''Fill the treeview with agents, fetching the info if necessary.'''
+		"""
+		Fill the treeview with agents, fetching the info if necessary
+		"""
 		self.model.clear()
 		self._total_items = self._progress = 0
 		self.window.progressbar.show()
@@ -926,15 +1006,19 @@ class AgentBrowser:
 			force = force, args = (force,))
 
 	def _pulse_timeout_cb(self, *args):
-		'''Simple callback to keep the progressbar pulsing.'''
+		"""
+		Simple callback to keep the progressbar pulsing
+		"""
 		if not self.active:
 			return False
 		self.window.progressbar.pulse()
 		return True
 
 	def _find_item(self, jid, node):
-		'''Check if an item is already in the treeview. Return an iter to it
-		if so, None otherwise.'''
+		"""
+		Check if an item is already in the treeview. Return an iter to it if so,
+		None otherwise
+		"""
 		iter_ = self.model.get_iter_root()
 		while iter_:
 			cjid = self.model.get_value(iter_, 0).decode('utf-8')
@@ -947,7 +1031,9 @@ class AgentBrowser:
 		return None
 
 	def _agent_items(self, jid, node, items, force):
-		'''Callback for when we receive a list of agent items.'''
+		"""
+		Callback for when we receive a list of agent items
+		"""
 		self.model.clear()
 		self._total_items = 0
 		gobject.source_remove(self._pulse_timeout)
@@ -973,7 +1059,9 @@ _('This service does not contain any items to browse.'))
 		self.window.services_treeview.set_model(self.model)
 
 	def _agent_info(self, jid, node, identities, features, data):
-		'''Callback for when we receive info about an agent's item.'''
+		"""
+		Callback for when we receive info about an agent's item
+		"""
 		iter_ = self._find_item(jid, node)
 		if not iter_:
 			# Not in the treeview, stop
@@ -987,21 +1075,27 @@ _('This service does not contain any items to browse.'))
 		self.update_actions()
 
 	def _add_item(self, jid, node, parent_node, item, force):
-		'''Called when an item should be added to the model. The result of a
-		disco#items query.'''
+		"""
+		Called when an item should be added to the model. The result of a
+		disco#items query
+		"""
 		self.model.append((jid, node, item.get('name', ''),
 			get_agent_address(jid, node)))
 		self.cache.get_info(jid, node, self._agent_info, force = force)
 
 	def _update_item(self, iter_, jid, node, item):
-		'''Called when an item should be updated in the model. The result of a
-		disco#items query. (seldom)'''
+		"""
+		Called when an item should be updated in the model. The result of a
+		disco#items query
+		"""
 		if 'name' in item:
 			self.model[iter_][2] = item['name']
 
 	def _update_info(self, iter_, jid, node, identities, features, data):
-		'''Called when an item should be updated in the model with further info.
-		The result of a disco#info query.'''
+		"""
+		Called when an item should be updated in the model with further info.
+		The result of a disco#info query
+		"""
 		name = identities[0].get('name', '')
 		if name:
 			self.model[iter_][2] = name
@@ -1012,8 +1106,11 @@ _('This service does not contain any items to browse.'))
 
 
 class ToplevelAgentBrowser(AgentBrowser):
-	'''This browser is used at the top level of a jabber server to browse
-	services such as transports, conference servers, etc.'''
+	"""
+	This browser is used at the top level of a jabber server to browse services
+	such as transports, conference servers, etc
+	"""
+
 	def __init__(self, *args):
 		AgentBrowser.__init__(self, *args)
 		self._progressbar_sourceid = None
@@ -1029,7 +1126,9 @@ class ToplevelAgentBrowser(AgentBrowser):
 		self._scroll_signal = None
 
 	def _pixbuf_renderer_data_func(self, col, cell, model, iter_):
-		'''Callback for setting the pixbuf renderer's properties.'''
+		"""
+		Callback for setting the pixbuf renderer's properties
+		"""
 		jid = model.get_value(iter_, 0)
 		if jid:
 			pix = model.get_value(iter_, 2)
@@ -1039,7 +1138,9 @@ class ToplevelAgentBrowser(AgentBrowser):
 			cell.set_property('visible', False)
 
 	def _text_renderer_data_func(self, col, cell, model, iter_):
-		'''Callback for setting the text renderer's properties.'''
+		"""
+		Callback for setting the text renderer's properties
+		"""
 		jid = model.get_value(iter_, 0)
 		markup = model.get_value(iter_, 3)
 		state = model.get_value(iter_, 4)
@@ -1060,7 +1161,9 @@ class ToplevelAgentBrowser(AgentBrowser):
 			cell.set_property('foreground_set', False)
 
 	def _treemodel_sort_func(self, model, iter1, iter2):
-		'''Sort function for our treemodel.'''
+		"""
+		Sort function for our treemode
+		"""
 		# Compare state
 		statecmp = cmp(model.get_value(iter1, 4), model.get_value(iter2, 4))
 		if statecmp == 0:
@@ -1120,8 +1223,9 @@ class ToplevelAgentBrowser(AgentBrowser):
 					self._show_tooltip, state)
 
 	def on_treeview_event_hide_tooltip(self, widget, event):
-		''' This happens on scroll_event, key_press_event
-			and button_press_event '''
+		"""
+		This happens on scroll_event, key_press_event and button_press_event
+		"""
 		self.tooltip.hide_tooltip()
 
 	def _create_treemodel(self):
@@ -1236,8 +1340,9 @@ class ToplevelAgentBrowser(AgentBrowser):
 		AgentBrowser._clean_actions(self)
 
 	def on_search_button_clicked(self, widget = None):
-		'''When we want to search something:
-		open search window'''
+		"""
+		When we want to search something: open search window
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if not iter_:
 			return
@@ -1261,8 +1366,9 @@ class ToplevelAgentBrowser(AgentBrowser):
 		self.window.services_treeview.queue_draw()
 
 	def on_execute_button_clicked(self, widget=None):
-		'''When we want to execute a command:
-		open adhoc command window'''
+		"""
+		When we want to execute a command: open adhoc command window
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if not iter_:
 			return
@@ -1271,9 +1377,10 @@ class ToplevelAgentBrowser(AgentBrowser):
 		adhoc_commands.CommandWindow(self.account, service, commandnode=node)
 
 	def on_register_button_clicked(self, widget = None):
-		'''When we want to register an agent:
-		request information about registering with the agent and close the
-		window.'''
+		"""
+		When we want to register an agent: request information about registering
+		with the agent and close the window
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if not iter_:
 			return
@@ -1283,8 +1390,10 @@ class ToplevelAgentBrowser(AgentBrowser):
 			self.window.destroy(chain = True)
 
 	def on_join_button_clicked(self, widget):
-		'''When we want to join an IRC room or create a new MUC room:
-		Opens the join_groupchat_window.'''
+		"""
+		When we want to join an IRC room or create a new MUC room: Opens the
+		join_groupchat_window
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if not iter_:
 			return
@@ -1375,7 +1484,9 @@ class ToplevelAgentBrowser(AgentBrowser):
 		AgentBrowser.browse(self, force = force)
 
 	def _expand_all(self):
-		'''Expand all items in the treeview'''
+		"""
+		Expand all items in the treeview
+		"""
 		# GTK apparently screws up here occasionally. :/
 		#def expand_all(*args):
 		#	self.window.services_treeview.expand_all()
@@ -1386,7 +1497,9 @@ class ToplevelAgentBrowser(AgentBrowser):
 		self.window.services_treeview.expand_all()
 
 	def _update_progressbar(self):
-		'''Update the progressbar.'''
+		"""
+		Update the progressbar
+		"""
 		# Refresh this every update
 		if self._progressbar_sourceid:
 			gobject.source_remove(self._progressbar_sourceid)
@@ -1408,13 +1521,17 @@ class ToplevelAgentBrowser(AgentBrowser):
 		self.window.progressbar.set_fraction(fraction)
 
 	def _hide_progressbar_cb(self, *args):
-		'''Simple callback to hide the progressbar a second after we finish.'''
+		"""
+		Simple callback to hide the progressbar a second after we finish
+		"""
 		if self.active:
 			self.window.progressbar.hide()
 		return False
 
 	def _friendly_category(self, category, type_=None):
-		'''Get the friendly category name and priority.'''
+		"""
+		Get the friendly category name and priority
+		"""
 		cat = None
 		if type_:
 			# Try type-specific override
@@ -1430,12 +1547,16 @@ class ToplevelAgentBrowser(AgentBrowser):
 		return cat, prio
 
 	def _create_category(self, cat, type_=None):
-		'''Creates a category row.'''
+		"""
+		Creates a category row
+		"""
 		cat, prio = self._friendly_category(cat, type_)
 		return self.model.append(None, ('', '', None, cat, prio))
 
 	def _find_category(self, cat, type_=None):
-		'''Looks up a category row and returns the iterator to it, or None.'''
+		"""
+		Looks up a category row and returns the iterator to it, or None
+		"""
 		cat = self._friendly_category(cat, type_)[0]
 		iter_ = self.model.get_iter_root()
 		while iter_:
@@ -1670,8 +1791,10 @@ class MucBrowser(AgentBrowser):
 				_('You can manage your bookmarks via Actions menu in your roster.'))
 
 	def on_join_button_clicked(self, *args):
-		'''When we want to join a conference:
-		Ask specific informations about the selected agent and close the window'''
+		"""
+		When we want to join a conference: ask specific informations about the
+		selected agent and close the window
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if not iter_:
 			return
@@ -1697,18 +1820,24 @@ class MucBrowser(AgentBrowser):
 		self.on_join_button_clicked()
 
 	def _start_info_query(self):
-		'''Idle callback to start checking for visible rows.'''
+		"""
+		Idle callback to start checking for visible rows
+		"""
 		self._fetch_source = None
 		self._query_visible()
 		return False
 
 	def on_scroll(self, *args):
-		'''Scrollwindow callback to trigger new queries on scolling.'''
+		"""
+		Scrollwindow callback to trigger new queries on scolling
+		"""
 		# This apparently happens when inactive sometimes
 		self._query_visible()
 
 	def _query_visible(self):
-		'''Query the next visible row for info.'''
+		"""
+		Query the next visible row for info
+		"""
 		if self._fetch_source:
 			# We're already fetching
 			return
@@ -1751,9 +1880,10 @@ class MucBrowser(AgentBrowser):
 		self._fetch_source = None
 
 	def _channel_altinfo(self, jid, node, items, name = None):
-		'''Callback for the alternate disco#items query. We try to atleast get
-		the amount of users in the room if the service does not support MUC
-		dataforms.'''
+		"""
+		Callback for the alternate disco#items query. We try to atleast get the
+		amount of users in the room if the service does not support MUC dataforms
+		"""
 		if items == 0:
 			# The server returned an error
 			self._broken += 1
@@ -1816,15 +1946,20 @@ class MucBrowser(AgentBrowser):
 		self.cache.get_items(jid, node, self._channel_altinfo)
 
 def PubSubBrowser(account, jid, node):
-	''' Returns an AgentBrowser subclass that will display service discovery
-	for particular pubsub service. Different pubsub services may need to
-	present different data during browsing. '''
+	"""
+	Return an AgentBrowser subclass that will display service discovery for
+	particular pubsub service. Different pubsub services may need to present
+	different data during browsing
+	"""
 	# for now, only discussion groups are supported...
 	# TODO: check if it has appropriate features to be such kind of service
 	return DiscussionGroupsBrowser(account, jid, node)
 
 class DiscussionGroupsBrowser(AgentBrowser):
-	''' For browsing pubsub-based discussion groups service. '''
+	"""
+	For browsing pubsub-based discussion groups service
+	"""
+
 	def __init__(self, account, jid, node):
 		AgentBrowser.__init__(self, account, jid, node)
 
@@ -1837,10 +1972,12 @@ class DiscussionGroupsBrowser(AgentBrowser):
 		self.subscribe_button = None
 		self.unsubscribe_button = None
 
-		gajim.connections[account].send_pb_subscription_query(jid, self._subscriptionsCB)
+		gajim.connections[account].send_pb_subscription_query(jid, self._on_pep_subscriptions)
 
 	def _create_treemodel(self):
-		''' Create treemodel for the window. '''
+		"""
+		Create treemodel for the window
+		"""
 		# JID, node, name (with description) - pango markup, dont have info?, subscribed?
 		self.model = gtk.TreeStore(str, str, str, bool, bool)
 		# sort by name
@@ -1891,8 +2028,10 @@ class DiscussionGroupsBrowser(AgentBrowser):
 		return self.in_list
 
 	def _add_item(self, jid, node, parent_node, item, force):
-		''' Called when we got basic information about new node from query.
-		Show the item. '''
+		"""
+		Called when we got basic information about new node from query. Show the
+		item
+		"""
 		name = item.get('name', '')
 
 		if self.subscriptions is not None:
@@ -1962,8 +2101,10 @@ class DiscussionGroupsBrowser(AgentBrowser):
 			self.unsubscribe_button = None
 
 	def update_actions(self):
-		'''Called when user selected a row. Make subscribe/unsubscribe buttons
-		sensitive appropriatelly.'''
+		"""
+		Called when user selected a row. Make subscribe/unsubscribe buttons
+		sensitive appropriatelly
+		"""
 		# we have nothing to do if we don't have buttons...
 		if self.subscribe_button is None: return
 
@@ -1980,7 +2121,9 @@ class DiscussionGroupsBrowser(AgentBrowser):
 			self.unsubscribe_button.set_sensitive(subscribed)
 
 	def on_post_button_clicked(self, widget):
-		'''Called when 'post' button is pressed. Open window to create post'''
+		"""
+		Called when 'post' button is pressed. Open window to create post
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if iter_ is None: return
 
@@ -1989,26 +2132,32 @@ class DiscussionGroupsBrowser(AgentBrowser):
 		groups.GroupsPostWindow(self.account, self.jid, groupnode)
 
 	def on_subscribe_button_clicked(self, widget):
-		'''Called when 'subscribe' button is pressed. Send subscribtion request.'''
+		"""
+		Called when 'subscribe' button is pressed. Send subscribtion request
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if iter_ is None: return
 
 		groupnode = model.get_value(iter_, 1)	# 1 = groupnode
 
-		gajim.connections[self.account].send_pb_subscribe(self.jid, groupnode, self._subscribeCB, groupnode)
+		gajim.connections[self.account].send_pb_subscribe(self.jid, groupnode, self._on_pep_subscribe, groupnode)
 
 	def on_unsubscribe_button_clicked(self, widget):
-		'''Called when 'unsubscribe' button is pressed. Send unsubscription request.'''
+		"""
+		Called when 'unsubscribe' button is pressed. Send unsubscription request
+		"""
 		model, iter_ = self.window.services_treeview.get_selection().get_selected()
 		if iter_ is None: return
 
 		groupnode = model.get_value(iter_, 1) # 1 = groupnode
 
-		gajim.connections[self.account].send_pb_unsubscribe(self.jid, groupnode, self._unsubscribeCB, groupnode)
+		gajim.connections[self.account].send_pb_unsubscribe(self.jid, groupnode, self._on_pep_unsubscribe, groupnode)
 
-	def _subscriptionsCB(self, conn, request):
-		''' We got the subscribed groups list stanza. Now, if we already
-		have items on the list, we should actualize them. '''
+	def _on_pep_subscriptions(self, conn, request):
+		"""
+		We got the subscribed groups list stanza. Now, if we already have items
+		on the list, we should actualize them
+		"""
 		try:
 			subscriptions = request.getTag('pubsub').getTag('subscriptions')
 		except Exception:
@@ -2027,30 +2176,34 @@ class DiscussionGroupsBrowser(AgentBrowser):
 			# 3 = insensitive checkbox for subscribed
 			# 4 = subscribed?
 			groupnode = row[1]
-			row[3]=False
-			row[4]=groupnode in groups
+			row[3] = False
+			row[4] = groupnode in groups
 
 		# we now know subscriptions, update button states
 		self.update_actions()
 
 		raise xmpp.NodeProcessed
 
-	def _subscribeCB(self, conn, request, groupnode):
-		'''We have just subscribed to a node. Update UI'''
+	def _on_pep_subscribe(self, conn, request, groupnode):
+		"""
+		We have just subscribed to a node. Update UI
+		"""
 		self.subscriptions.add(groupnode)
 
 		model = self.window.services_treeview.get_model()
 		for row in model:
 			if row[1] == groupnode: # 1 = groupnode
-				row[4]=True
+				row[4] = True
 				break
 
 		self.update_actions()
 
 		raise xmpp.NodeProcessed
 
-	def _unsubscribeCB(self, conn, request, groupnode):
-		'''We have just unsubscribed from a node. Update UI'''
+	def _on_pep_unsubscribe(self, conn, request, groupnode):
+		"""
+		We have just unsubscribed from a node. Update UI
+		"""
 		self.subscriptions.remove(groupnode)
 
 		model = self.window.services_treeview.get_model()
diff --git a/src/eggtrayicon.c b/src/eggtrayicon.c
deleted file mode 100644
index 56b3a0fb9..000000000
--- a/src/eggtrayicon.c
+++ /dev/null
@@ -1,584 +0,0 @@
-/* eggtrayicon.c
- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <string.h>
-#include <glib/gi18n.h>
-#include <libintl.h>
-
-#include "eggtrayicon.h"
-
-#include <gdkconfig.h>
-#if defined (GDK_WINDOWING_X11)
-#include <gdk/gdkx.h>
-#include <X11/Xatom.h>
-#elif defined (GDK_WINDOWING_WIN32)
-#include <gdk/gdkwin32.h>
-#endif
-
-#ifndef EGG_COMPILATION
-#ifndef _
-#define _(x) dgettext (GETTEXT_PACKAGE, x)
-#define N_(x) x
-#endif
-#else
-#define _(x) x
-#define N_(x) x
-#endif
-
-#define SYSTEM_TRAY_REQUEST_DOCK    0
-#define SYSTEM_TRAY_BEGIN_MESSAGE   1
-#define SYSTEM_TRAY_CANCEL_MESSAGE  2
-
-#define SYSTEM_TRAY_ORIENTATION_HORZ 0
-#define SYSTEM_TRAY_ORIENTATION_VERT 1
-
-enum {
-  PROP_0,
-  PROP_ORIENTATION
-};
-
-static GtkPlugClass *parent_class = NULL;
-
-static void egg_tray_icon_init (EggTrayIcon *icon);
-static void egg_tray_icon_class_init (EggTrayIconClass *klass);
-
-static void egg_tray_icon_get_property (GObject    *object,
-					guint       prop_id,
-					GValue     *value,
-					GParamSpec *pspec);
-
-static void egg_tray_icon_add (GtkContainer *container, GtkWidget *widget);
-
-static void egg_tray_icon_realize   (GtkWidget *widget);
-static void egg_tray_icon_unrealize (GtkWidget *widget);
-
-#ifdef GDK_WINDOWING_X11
-static void egg_tray_icon_update_manager_window    (EggTrayIcon *icon,
-						    gboolean     dock_if_realized);
-static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon);
-#endif
-
-GType
-egg_tray_icon_get_type (void)
-{
-  static GType our_type = 0;
-
-  if (our_type == 0)
-    {
-      static const GTypeInfo our_info =
-      {
-	sizeof (EggTrayIconClass),
-	(GBaseInitFunc) NULL,
-	(GBaseFinalizeFunc) NULL,
-	(GClassInitFunc) egg_tray_icon_class_init,
-	NULL, /* class_finalize */
-	NULL, /* class_data */
-	sizeof (EggTrayIcon),
-	0,    /* n_preallocs */
-	(GInstanceInitFunc) egg_tray_icon_init
-      };
-
-      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
-    }
-
-  return our_type;
-}
-
-static void
-egg_tray_icon_init (EggTrayIcon *icon)
-{
-  icon->stamp = 1;
-  icon->orientation = GTK_ORIENTATION_HORIZONTAL;
-
-  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
-}
-
-static void
-egg_tray_icon_class_init (EggTrayIconClass *klass)
-{
-  GObjectClass *gobject_class = (GObjectClass *)klass;
-  GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
-  GtkContainerClass *container_class = (GtkContainerClass *)klass;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class->get_property = egg_tray_icon_get_property;
-
-  widget_class->realize   = egg_tray_icon_realize;
-  widget_class->unrealize = egg_tray_icon_unrealize;
-
-  container_class->add = egg_tray_icon_add;
-
-  g_object_class_install_property (gobject_class,
-				   PROP_ORIENTATION,
-				   g_param_spec_enum ("orientation",
-						      _("Orientation"),
-						      _("The orientation of the tray."),
-						      GTK_TYPE_ORIENTATION,
-						      GTK_ORIENTATION_HORIZONTAL,
-						      G_PARAM_READABLE));
-
-#if defined (GDK_WINDOWING_X11)
-  /* Nothing */
-#elif defined (GDK_WINDOWING_WIN32)
-  g_warning ("Port eggtrayicon to Win32");
-#else
-  g_warning ("Port eggtrayicon to this GTK+ backend");
-#endif
-}
-
-static void
-egg_tray_icon_get_property (GObject    *object,
-			    guint       prop_id,
-			    GValue     *value,
-			    GParamSpec *pspec)
-{
-  EggTrayIcon *icon = EGG_TRAY_ICON (object);
-
-  switch (prop_id)
-    {
-    case PROP_ORIENTATION:
-      g_value_set_enum (value, icon->orientation);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-#ifdef GDK_WINDOWING_X11
-
-static Display *
-egg_tray_icon_get_x_display(EggTrayIcon *icon)
-{
-  Display *xdisplay = NULL;
-
-  GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (icon));
-  if (!GDK_IS_DISPLAY (display))
-    display = gdk_display_get_default ();
-
-  xdisplay = GDK_DISPLAY_XDISPLAY (display);
-
-  return xdisplay;
-}
-
-static void
-egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
-{
-  Display *xdisplay;
-  Atom type;
-  int format;
-  union {
-	gulong *prop;
-	guchar *prop_ch;
-  } prop = { NULL };
-  gulong nitems;
-  gulong bytes_after;
-  int error, result;
-
-  g_assert (icon->manager_window != None);
-
-  xdisplay = egg_tray_icon_get_x_display(icon);
-  if (xdisplay == NULL)
-    return;
-
-  gdk_error_trap_push ();
-  type = None;
-  result = XGetWindowProperty (xdisplay,
-			       icon->manager_window,
-			       icon->orientation_atom,
-			       0, G_MAXLONG, FALSE,
-			       XA_CARDINAL,
-			       &type, &format, &nitems,
-			       &bytes_after, &(prop.prop_ch));
-  error = gdk_error_trap_pop ();
-
-  if (error || result != Success)
-    return;
-
-  if (type == XA_CARDINAL)
-    {
-      GtkOrientation orientation;
-
-      orientation = (prop.prop [0] == SYSTEM_TRAY_ORIENTATION_HORZ) ?
-					GTK_ORIENTATION_HORIZONTAL :
-					GTK_ORIENTATION_VERTICAL;
-
-      if (icon->orientation != orientation)
-        {
-          icon->orientation = orientation;
-
-          g_object_notify (G_OBJECT (icon), "orientation");
-        }
-    }
-
-  if (prop.prop)
-    XFree (prop.prop);
-}
-
-static GdkFilterReturn
-egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data)
-{
-  EggTrayIcon *icon = user_data;
-  XEvent *xev = (XEvent *)xevent;
-
-  if (xev->xany.type == ClientMessage &&
-      xev->xclient.message_type == icon->manager_atom &&
-      xev->xclient.data.l[1] == icon->selection_atom)
-    {
-      egg_tray_icon_update_manager_window (icon, TRUE);
-    }
-  else if (xev->xany.window == icon->manager_window)
-    {
-      if (xev->xany.type == PropertyNotify &&
-	  xev->xproperty.atom == icon->orientation_atom)
-	{
-	  egg_tray_icon_get_orientation_property (icon);
-	}
-      if (xev->xany.type == DestroyNotify)
-	{
-	  egg_tray_icon_manager_window_destroyed (icon);
-	}
-    }
-  return GDK_FILTER_CONTINUE;
-}
-
-#endif
-
-static void
-egg_tray_icon_unrealize (GtkWidget *widget)
-{
-#ifdef GDK_WINDOWING_X11
-  EggTrayIcon *icon = EGG_TRAY_ICON (widget);
-  GdkWindow *root_window;
-
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-                                              icon->manager_window);
-
-      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-    }
-
-  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
-
-  gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
-
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-#endif
-}
-
-#ifdef GDK_WINDOWING_X11
-
-static void
-egg_tray_icon_send_manager_message (EggTrayIcon *icon,
-				    long         message,
-				    Window       window,
-				    long         data1,
-				    long         data2,
-				    long         data3)
-{
-  XClientMessageEvent ev;
-  Display *display;
-
-  ev.type = ClientMessage;
-  ev.window = window;
-  ev.message_type = icon->system_tray_opcode_atom;
-  ev.format = 32;
-  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
-  ev.data.l[1] = message;
-  ev.data.l[2] = data1;
-  ev.data.l[3] = data2;
-  ev.data.l[4] = data3;
-
-  display = egg_tray_icon_get_x_display(icon);
-
-  if (display == NULL)
-    return;
-
-  gdk_error_trap_push ();
-  XSendEvent (display,
-	      icon->manager_window, False, NoEventMask, (XEvent *)&ev);
-  XSync (display, False);
-  gdk_error_trap_pop ();
-}
-
-static void
-egg_tray_icon_send_dock_request (EggTrayIcon *icon)
-{
-  egg_tray_icon_send_manager_message (icon,
-				      SYSTEM_TRAY_REQUEST_DOCK,
-				      icon->manager_window,
-				      gtk_plug_get_id (GTK_PLUG (icon)),
-				      0, 0);
-}
-
-static void
-egg_tray_icon_update_manager_window (EggTrayIcon *icon,
-				     gboolean     dock_if_realized)
-{
-  Display *xdisplay;
-
-  if (icon->manager_window != None)
-    return;
-
-  xdisplay = egg_tray_icon_get_x_display(icon);
-
-  if (xdisplay == NULL)
-    return;
-
-  XGrabServer (xdisplay);
-
-  icon->manager_window = XGetSelectionOwner (xdisplay,
-					     icon->selection_atom);
-
-  if (icon->manager_window != None)
-    XSelectInput (xdisplay,
-		  icon->manager_window, StructureNotifyMask|PropertyChangeMask);
-
-  XUngrabServer (xdisplay);
-  XFlush (xdisplay);
-
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-					      icon->manager_window);
-
-      gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-
-      if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
-	egg_tray_icon_send_dock_request (icon);
-
-      egg_tray_icon_get_orientation_property (icon);
-    }
-}
-
-static gboolean
-transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
-{
-  gdk_window_clear_area (widget->window, event->area.x, event->area.y,
-			 event->area.width, event->area.height);
-  return FALSE;
-}
-
-static void
-make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
-			gpointer user_data)
-{
-  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-}
-
-static void
-make_transparent (GtkWidget *widget, gpointer user_data)
-{
-  if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
-    return;
-
-  gtk_widget_set_app_paintable (widget, TRUE);
-  gtk_widget_set_double_buffered (widget, FALSE);
-  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-  g_signal_connect (widget, "expose_event",
-		    G_CALLBACK (transparent_expose_event), NULL);
-  g_signal_connect_after (widget, "style_set",
-			  G_CALLBACK (make_transparent_again), NULL);
-}
-
-static void
-egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
-{
-  GdkWindow *gdkwin;
-
-  g_return_if_fail (icon->manager_window != None);
-
-  gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-					  icon->manager_window);
-
-  gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-
-  icon->manager_window = None;
-
-  egg_tray_icon_update_manager_window (icon, TRUE);
-}
-
-#endif
-
-static void
-egg_tray_icon_realize (GtkWidget *widget)
-{
-#ifdef GDK_WINDOWING_X11
-  EggTrayIcon *icon = EGG_TRAY_ICON (widget);
-  GdkScreen *screen;
-  Display *xdisplay;
-  char buffer[256];
-  GdkWindow *root_window;
-
-  if (GTK_WIDGET_CLASS (parent_class)->realize)
-    GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
-  make_transparent (widget, NULL);
-
-  xdisplay = egg_tray_icon_get_x_display(icon);
-
-  if (xdisplay == NULL)
-    return;
-
-  screen = gtk_widget_get_screen (widget);
-
-  /* Now see if there's a manager window around */
-  g_snprintf (buffer, sizeof (buffer),
-	      "_NET_SYSTEM_TRAY_S%d",
-	      gdk_screen_get_number (screen));
-
-  icon->selection_atom = XInternAtom (xdisplay, buffer, False);
-
-  icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
-
-  icon->system_tray_opcode_atom = XInternAtom (xdisplay,
-						   "_NET_SYSTEM_TRAY_OPCODE",
-						   False);
-
-  icon->orientation_atom = XInternAtom (xdisplay,
-					"_NET_SYSTEM_TRAY_ORIENTATION",
-					False);
-
-  egg_tray_icon_update_manager_window (icon, FALSE);
-  egg_tray_icon_send_dock_request (icon);
-
-  root_window = gdk_screen_get_root_window (screen);
-
-  /* Add a root window filter so that we get changes on MANAGER */
-  gdk_window_add_filter (root_window,
-			 egg_tray_icon_manager_filter, icon);
-#endif
-}
-
-static void
-egg_tray_icon_add (GtkContainer *container, GtkWidget *widget)
-{
-  g_signal_connect (widget, "realize",
-		    G_CALLBACK (make_transparent), NULL);
-  GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
-}
-
-EggTrayIcon *
-egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL);
-}
-
-EggTrayIcon*
-egg_tray_icon_new (const gchar *name)
-{
-  return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL);
-}
-
-guint
-egg_tray_icon_send_message (EggTrayIcon *icon,
-			    gint         timeout,
-			    const gchar *message,
-			    gint         len)
-{
-  guint stamp;
-
-  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
-  g_return_val_if_fail (timeout >= 0, 0);
-  g_return_val_if_fail (message != NULL, 0);
-
-#ifdef GDK_WINDOWING_X11
-  if (icon->manager_window == None)
-    return 0;
-#endif
-
-  if (len < 0)
-    len = strlen (message);
-
-  stamp = icon->stamp++;
-
-#ifdef GDK_WINDOWING_X11
-  /* Get ready to send the message */
-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-				      timeout, len, stamp);
-
-  /* Now to send the actual message */
-  gdk_error_trap_push ();
-  while (len > 0)
-    {
-      XClientMessageEvent ev;
-      Display *xdisplay;
-
-      xdisplay = egg_tray_icon_get_x_display(icon);
-
-      if (xdisplay == NULL)
-        return 0;
-
-      ev.type = ClientMessage;
-      ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
-      ev.format = 8;
-      ev.message_type = XInternAtom (xdisplay,
-				     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
-      if (len > 20)
-	{
-	  memcpy (&ev.data, message, 20);
-	  len -= 20;
-	  message += 20;
-	}
-      else
-	{
-	  memcpy (&ev.data, message, len);
-	  len = 0;
-	}
-
-      XSendEvent (xdisplay,
-		  icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
-      XSync (xdisplay, False);
-    }
-  gdk_error_trap_pop ();
-#endif
-
-  return stamp;
-}
-
-void
-egg_tray_icon_cancel_message (EggTrayIcon *icon,
-			      guint        id)
-{
-  g_return_if_fail (EGG_IS_TRAY_ICON (icon));
-  g_return_if_fail (id > 0);
-#ifdef GDK_WINDOWING_X11
-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-				      id, 0, 0);
-#endif
-}
-
-GtkOrientation
-egg_tray_icon_get_orientation (EggTrayIcon *icon)
-{
-  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), GTK_ORIENTATION_HORIZONTAL);
-
-  return icon->orientation;
-}
diff --git a/src/eggtrayicon.h b/src/eggtrayicon.h
deleted file mode 100644
index 557fdb20c..000000000
--- a/src/eggtrayicon.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eggtrayicon.h
- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EGG_TRAY_ICON_H__
-#define __EGG_TRAY_ICON_H__
-
-#include <gtk/gtkplug.h>
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
-
-G_BEGIN_DECLS
-
-#define EGG_TYPE_TRAY_ICON		(egg_tray_icon_get_type ())
-#define EGG_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
-#define EGG_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-#define EGG_IS_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
-#define EGG_IS_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
-#define EGG_TRAY_ICON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-
-typedef struct _EggTrayIcon	  EggTrayIcon;
-typedef struct _EggTrayIconClass  EggTrayIconClass;
-
-struct _EggTrayIcon
-{
-  GtkPlug parent_instance;
-
-  guint stamp;
-
-#ifdef GDK_WINDOWING_X11
-  Atom selection_atom;
-  Atom manager_atom;
-  Atom system_tray_opcode_atom;
-  Atom orientation_atom;
-  Window manager_window;
-#endif
-  GtkOrientation orientation;
-};
-
-struct _EggTrayIconClass
-{
-  GtkPlugClass parent_class;
-};
-
-GType        egg_tray_icon_get_type       (void);
-
-EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
-					   const gchar *name);
-
-EggTrayIcon *egg_tray_icon_new            (const gchar *name);
-
-guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
-					   gint         timeout,
-					   const char  *message,
-					   gint         len);
-void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
-					   guint        id);
-
-GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon);
-
-G_END_DECLS
-
-#endif /* __EGG_TRAY_ICON_H__ */
diff --git a/src/features_window.py b/src/features_window.py
index 609959e65..336bbd467 100644
--- a/src/features_window.py
+++ b/src/features_window.py
@@ -33,7 +33,9 @@ from common import helpers
 from common import kwalletbinding
 
 class FeaturesWindow:
-	'''Class for features window'''
+	"""
+	Class for features window
+	"""
 
 	def __init__(self):
 		self.xml = gtkgui_helpers.get_glade('features_window.glade')
@@ -83,10 +85,6 @@ class FeaturesWindow:
 				_('Passive popups notifying for new events.'),
 				_('Requires python-notify or instead python-dbus in conjunction with notification-daemon.'),
 				_('Feature not available under Windows.')),
-			_('Trayicon'): (self.trayicon_available,
-				_('A icon in systemtray reflecting the current presence.'),
-				_('Requires python-gnome2-extras or compiled trayicon module from Gajim sources.'),
-				_('Requires PyGTK >= 2.10.')),
 			_('Automatic status'): (self.idle_available,
 				_('Ability to measure idle time, in order to set auto status.'),
 				_('Requires libxss library.'),
@@ -103,10 +101,6 @@ class FeaturesWindow:
 				_('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'),
 				_('Requires python-docutils.'),
 				_('Requires python-docutils.')),
-			_('Banners and clickable links'): (self.pysexy_available,
-				_('Ability to have clickable URLs in chat and groupchat window banners.'),
-				_('Requires python-sexy.'),
-				_('Requires python-sexy.')),
 			_('Audio / Video'): (self.farsight_available,
 				_('Ability to start audio and video chat.'),
 				_('Requires python-farsight.'),
@@ -240,21 +234,13 @@ class FeaturesWindow:
 			return False
 		return True
 
-	def trayicon_available(self):
-		if os.name == 'nt':
-			return True
-		try:
-			import systray
-		except Exception:
-			return False
-		return True
-
 	def idle_available(self):
 		from common import sleepy
 		return sleepy.SUPPORTED
 
 	def latex_available(self):
-		return gajim.HAVE_LATEX
+		from common import latex
+		return latex.check_for_latex_support()
 
 	def pycrypto_available(self):
 		return gajim.HAVE_PYCRYPTO
@@ -266,9 +252,6 @@ class FeaturesWindow:
 			return False
 		return True
 
-	def pysexy_available(self):
-		return gajim.HAVE_PYSEXY
-
 	def farsight_available(self):
 		return gajim.HAVE_FARSIGHT
 
diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py
index cae4549e6..55cb90281 100644
--- a/src/filetransfers_window.py
+++ b/src/filetransfers_window.py
@@ -33,6 +33,8 @@ import dialogs
 
 from common import gajim
 from common import helpers
+from common.protocol.bytestream import (is_transfer_active, is_transfer_paused,
+	is_transfer_stopped)
 
 C_IMAGE = 0
 C_LABELS = 1
@@ -55,18 +57,17 @@ class FileTransfersWindow:
 		self.cleanup_button = self.xml.get_widget('cleanup_button')
 		self.notify_ft_checkbox = self.xml.get_widget(
 			'notify_ft_complete_checkbox')
-		notify = gajim.config.get('notify_on_file_complete')
-		if notify:
-			self.notify_ft_checkbox.set_active(True)
-		else:
-			self.notify_ft_checkbox.set_active(False)
+
+		shall_notify = gajim.config.get('notify_on_file_complete')
+		self.notify_ft_checkbox.set_active(shall_notify
+													)
 		self.model = gtk.ListStore(gtk.gdk.Pixbuf, str, str, str, str, int, str)
 		self.tree.set_model(self.model)
 		col = gtk.TreeViewColumn()
 
 		render_pixbuf = gtk.CellRendererPixbuf()
 
-		col.pack_start(render_pixbuf, expand = True)
+		col.pack_start(render_pixbuf, expand=True)
 		render_pixbuf.set_property('xpad', 3)
 		render_pixbuf.set_property('ypad', 3)
 		render_pixbuf.set_property('yalign', .0)
@@ -104,7 +105,7 @@ class FileTransfersWindow:
 		renderer = gtk.CellRendererProgress()
 		renderer.set_property('yalign', 0.5)
 		renderer.set_property('xalign', 0.5)
-		col.pack_start(renderer, expand = False)
+		col.pack_start(renderer, expand=False)
 		col.add_attribute(renderer, 'text' , C_PROGRESS)
 		col.add_attribute(renderer, 'value' , C_PERCENT)
 		col.set_resizable(True)
@@ -134,15 +135,17 @@ class FileTransfersWindow:
 		self.xml.signal_autoconnect(self)
 
 	def find_transfer_by_jid(self, account, jid):
-		''' find all transfers with peer 'jid' that belong to 'account' '''
-		active_transfers = [[],[]] # ['senders', 'receivers']
+		"""
+		Find all transfers with peer 'jid' that belong to 'account'
+		"""
+		active_transfers = [[], []] # ['senders', 'receivers']
 
 		# 'account' is the sender
 		for file_props in self.files_props['s'].values():
 			if file_props['tt_account'] == account:
 				receiver_jid = unicode(file_props['receiver']).split('/')[0]
 				if jid == receiver_jid:
-					if not self.is_transfer_stopped(file_props):
+					if not is_transfer_stopped(file_props):
 						active_transfers[0].append(file_props)
 
 		# 'account' is the recipient
@@ -150,12 +153,14 @@ class FileTransfersWindow:
 			if file_props['tt_account'] == account:
 				sender_jid = unicode(file_props['sender']).split('/')[0]
 				if jid == sender_jid:
-					if not self.is_transfer_stopped(file_props):
+					if not is_transfer_stopped(file_props):
 						active_transfers[1].append(file_props)
 		return active_transfers
 
 	def show_completed(self, jid, file_props):
-		''' show a dialog saying that file (file_props) has been transferred'''
+		"""
+		Show a dialog saying that file (file_props) has been transferred
+		"""
 		def on_open(widget, file_props):
 			dialog.destroy()
 			if 'file-name' not in file_props:
@@ -181,8 +186,8 @@ class FileTransfersWindow:
 		else:
 			#You is a reply of who sent a file
 			sender = _('You')
-		sectext += '\n\t' +_('Sender: %s') % sender
-		sectext += '\n\t' +_('Recipient: ')
+		sectext += '\n\t' + _('Sender: %s') % sender
+		sectext += '\n\t' + _('Recipient: ')
 		if file_props['type'] == 's':
 			jid = unicode(file_props['receiver']).split('/')[0]
 			receiver_name = gajim.contacts.get_first_contact_from_jid(
@@ -193,7 +198,7 @@ class FileTransfersWindow:
 			recipient = _('You')
 		sectext += recipient
 		if file_props['type'] == 'r':
-			sectext += '\n\t' +_('Saved in: %s') % file_path
+			sectext += '\n\t' + _('Saved in: %s') % file_path
 		dialog = dialogs.HigDialog(None, gtk.MESSAGE_INFO, gtk.BUTTONS_NONE,
 				_('File transfer completed'), sectext)
 		if file_props['type'] == 'r':
@@ -207,19 +212,21 @@ class FileTransfersWindow:
 		dialog.show_all()
 
 	def show_request_error(self, file_props):
-		''' show error dialog to the recipient saying that transfer
-		has been canceled'''
+		"""
+		Show error dialog to the recipient saying that transfer has been canceled
+		"""
 		dialogs.InformationDialog(_('File transfer cancelled'), _('Connection with peer cannot be established.'))
 		self.tree.get_selection().unselect_all()
 
 	def show_send_error(self, file_props):
-		''' show error dialog to the sender saying that transfer
-		has been canceled'''
+		"""
+		Show error dialog to the sender saying that transfer has been canceled
+		"""
 		dialogs.InformationDialog(_('File transfer cancelled'),
-_('Connection with peer cannot be established.'))
+			_('Connection with peer cannot be established.'))
 		self.tree.get_selection().unselect_all()
 
-	def show_stopped(self, jid, file_props, error_msg = ''):
+	def show_stopped(self, jid, file_props, error_msg=''):
 		if file_props['type'] == 'r':
 			file_name = os.path.basename(file_props['file-name'])
 		else:
@@ -232,7 +239,6 @@ _('Connection with peer cannot be established.'))
 		self.tree.get_selection().unselect_all()
 
 	def show_file_send_request(self, account, contact):
-
 		desc_entry = gtk.Entry()
 
 		def on_ok(widget):
@@ -253,8 +259,8 @@ _('Connection with peer cannot be established.'))
 			gtk.RESPONSE_OK,
 			True, # select multiple true as we can select many files to send
 			gajim.config.get('last_send_dir'),
-			on_response_ok = on_ok,
-			on_response_cancel = lambda e:dialog.destroy()
+			on_response_ok=on_ok,
+			on_response_cancel=lambda e:dialog.destroy()
 			)
 
 		btn = gtk.Button(_('_Send'))
@@ -264,8 +270,8 @@ _('Connection with peer cannot be established.'))
 		dialog.set_default_response(gtk.RESPONSE_OK)
 
 		desc_hbox = gtk.HBox(False, 5)
-		desc_hbox.pack_start(gtk.Label(_('Description: ')),False,False,0)
-		desc_hbox.pack_start(desc_entry,True,True,0)
+		desc_hbox.pack_start(gtk.Label(_('Description: ')), False, False, 0)
+		desc_hbox.pack_start(desc_entry, True, True, 0)
 
 		dialog.vbox.pack_start(desc_hbox, False, False, 0)
 
@@ -273,7 +279,9 @@ _('Connection with peer cannot be established.'))
 		desc_hbox.show_all()
 
 	def send_file(self, account, contact, file_path, file_desc=''):
-		''' start the real transfer(upload) of the file '''
+		"""
+		Start the real transfer(upload) of the file
+		"""
 		if gtkgui_helpers.file_is_locked(file_path):
 			pritext = _('Gajim cannot access this file')
 			sextext = _('This file is being used by another process.')
@@ -303,8 +311,10 @@ _('Connection with peer cannot be established.'))
 		gajim.connections[account].send_file_approval(file_props)
 
 	def show_file_request(self, account, contact, file_props):
-		''' show dialog asking for comfirmation and store location of new
-		file requested by a contact'''
+		"""
+		Show dialog asking for comfirmation and store location of new file
+		requested by a contact
+		"""
 		if file_props is None or 'name' not in file_props:
 			return
 		sec_text = '\t' + _('File: %s') % gobject.markup_escape_text(
@@ -366,14 +376,14 @@ _('Connection with peer cannot be established.'))
 				gajim.connections[account].send_file_rejection(file_props)
 
 			dialog2 = dialogs.FileChooserDialog(
-				title_text = _('Save File as...'),
-				action = gtk.FILE_CHOOSER_ACTION_SAVE,
-				buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+				title_text=_('Save File as...'),
+				action=gtk.FILE_CHOOSER_ACTION_SAVE,
+				buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
 				gtk.STOCK_SAVE, gtk.RESPONSE_OK),
-				default_response = gtk.RESPONSE_OK,
-				current_folder = gajim.config.get('last_save_dir'),
-				on_response_ok = (on_ok, account, contact, file_props),
-				on_response_cancel = (on_cancel, account, contact, file_props))
+				default_response=gtk.RESPONSE_OK,
+				current_folder=gajim.config.get('last_save_dir'),
+				on_response_ok=(on_ok, account, contact, file_props),
+				on_response_cancel=(on_cancel, account, contact, file_props))
 
 			dialog2.set_current_name(file_props['name'])
 			dialog2.connect('delete-event', lambda widget, event:
@@ -383,8 +393,8 @@ _('Connection with peer cannot be established.'))
 			gajim.connections[account].send_file_rejection(file_props)
 
 		dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text,
-			on_response_ok = (on_response_ok, account, contact, file_props),
-			on_response_cancel = (on_response_cancel, account, file_props))
+			on_response_ok=(on_response_ok, account, contact, file_props),
+			on_response_cancel=(on_response_cancel, account, file_props))
 		dialog.connect('delete-event', lambda widget, event:
 			on_response_cancel(widget, account, file_props))
 		dialog.popup()
@@ -394,7 +404,9 @@ _('Connection with peer cannot be established.'))
 			self.window.render_icon(self.icons[ident], gtk.ICON_SIZE_MENU))
 
 	def set_status(self, typ, sid, status):
-		''' change the status of a transfer to state 'status' '''
+		"""
+		Change the status of a transfer to state 'status'
+		"""
 		iter_ = self.get_iter_by_sid(typ, sid)
 		if iter_ is None:
 			return
@@ -409,8 +421,10 @@ _('Connection with peer cannot be established.'))
 		self.select_func(path)
 
 	def _format_percent(self, percent):
-		''' add extra spaces from both sides of the percent, so that
-		progress string has always a fixed size'''
+		"""
+		Add extra spaces from both sides of the percent, so that progress string
+		has always a fixed size
+		"""
 		_str = '          '
 		if percent != 100.:
 			_str += ' '
@@ -432,7 +446,7 @@ _('Connection with peer cannot be established.'))
 		#Print remaining time in format 00:00:00
 		#You can change the places of (hours), (minutes), (seconds) -
 		#they are not translatable.
-		return _('%(hours)02.d:%(minutes)02.d:%(seconds)02.d')  % times
+		return _('%(hours)02.d:%(minutes)02.d:%(seconds)02.d') % times
 
 	def _get_eta_and_speed(self, full_size, transfered_size, file_props):
 		if len(file_props['transfered_size']) == 0:
@@ -480,8 +494,10 @@ _('Connection with peer cannot be established.'))
 		del(self.files_props[sid[0]][sid[1:]])
 		del(file_props)
 
-	def set_progress(self, typ, sid, transfered_size, iter_ = None):
-		''' change the progress of a transfer with new transfered size'''
+	def set_progress(self, typ, sid, transfered_size, iter_=None):
+		"""
+		Change the progress of a transfer with new transfered size
+		"""
 		if sid not in self.files_props[typ]:
 			return
 		file_props = self.files_props[typ][sid]
@@ -546,8 +562,10 @@ _('Connection with peer cannot be established.'))
 				self.select_func(path)
 
 	def get_iter_by_sid(self, typ, sid):
-		'''returns iter to the row, which holds file transfer, identified by the
-		session id'''
+		"""
+		Return iter to the row, which holds file transfer, identified by the
+		session id
+		"""
 		iter_ = self.model.get_iter_root()
 		while iter_:
 			if typ + sid == self.model[iter_][C_SID].decode('utf-8'):
@@ -555,15 +573,16 @@ _('Connection with peer cannot be established.'))
 			iter_ = self.model.iter_next(iter_)
 
 	def get_send_file_props(self, account, contact, file_path, file_name,
-	file_desc=''):
-		''' create new file_props dict and set initial file transfer
-		properties in it'''
+			file_desc=''):
+		"""
+		Create new file_props dict and set initial file transfer properties in it
+		"""
 		file_props = {'file-name' : file_path, 'name' : file_name,
 			'type' : 's', 'desc' : file_desc}
 		if os.path.isfile(file_path):
 			stat = os.stat(file_path)
 		else:
-			dialogs.ErrorDialog(_('Invalid File'), _('File: ')  + file_path)
+			dialogs.ErrorDialog(_('Invalid File'), _('File: ') + file_path)
 			return None
 		if stat[6] == 0:
 			dialogs.ErrorDialog(_('Invalid File'),
@@ -582,7 +601,9 @@ _('Connection with peer cannot be established.'))
 		return file_props
 
 	def add_transfer(self, account, contact, file_props):
-		''' add new transfer to FT window and show the FT window '''
+		"""
+		Add new transfer to FT window and show the FT window
+		"""
 		self.on_transfers_list_leave_notify_event(None)
 		if file_props is None:
 			return
@@ -638,14 +659,13 @@ _('Connection with peer cannot be established.'))
 					self.tooltip.timeout = gobject.timeout_add(500,
 						self.show_tooltip, widget)
 
-	def on_transfers_list_leave_notify_event(self, widget = None, event = None):
+	def on_transfers_list_leave_notify_event(self, widget=None, event=None):
 		if event is not None:
 			self.height_diff = int(event.y)
 		elif self.height_diff is 0:
 			return
 		pointer = self.tree.get_pointer()
-		props = self.tree.get_path_at_pos(pointer[0],
-			pointer[1] - self.height_diff)
+		props = self.tree.get_path_at_pos(pointer[0], pointer[1] - self.height_diff)
 		if self.tooltip.timeout > 0:
 			if not props or self.tooltip.id == props[0]:
 				self.tooltip.hide_tooltip()
@@ -654,47 +674,20 @@ _('Connection with peer cannot be established.'))
 		# try to open the containing folder
 		self.on_open_folder_menuitem_activate(widget)
 
-	def is_transfer_paused(self, file_props):
-		if 'stopped' in file_props and file_props['stopped']:
-			return False
-		if 'completed' in file_props and file_props['completed']:
-			return False
-		if 'disconnect_cb' not in file_props:
-			return False
-		return file_props['paused']
-
-	def is_transfer_active(self, file_props):
-		if 'stopped' in file_props and file_props['stopped']:
-			return False
-		if 'completed' in file_props and file_props['completed']:
-			return False
-		if 'started' not in file_props or not file_props['started']:
-			return False
-		if 'paused' not in file_props:
-			return True
-		return not file_props['paused']
-
-	def is_transfer_stopped(self, file_props):
-		if 'error' in file_props and file_props['error'] != 0:
-			return True
-		if 'completed' in file_props and file_props['completed']:
-			return True
-		if 'connected' in file_props and file_props['connected'] == False:
-			return True
-		if 'stopped' not in file_props or not file_props['stopped']:
-			return False
-		return True
-
 	def set_cleanup_sensitivity(self):
-		''' check if there are transfer rows and set cleanup_button
-		sensitive, or insensitive if model is empty'''
+		"""
+		Check if there are transfer rows and set cleanup_button sensitive, or
+		insensitive if model is empty
+		"""
 		if len(self.model) == 0:
 			self.cleanup_button.set_sensitive(False)
 		else:
 			self.cleanup_button.set_sensitive(True)
 
 	def set_all_insensitive(self):
-		''' make all buttons/menuitems insensitive '''
+		"""
+		Make all buttons/menuitems insensitive
+		"""
 		self.pause_button.set_sensitive(False)
 		self.pause_menuitem.set_sensitive(False)
 		self.continue_menuitem.set_sensitive(False)
@@ -705,8 +698,10 @@ _('Connection with peer cannot be established.'))
 		self.set_cleanup_sensitivity()
 
 	def set_buttons_sensitive(self, path, is_row_selected):
-		''' make buttons/menuitems sensitive as appropriate to
-		the state of file transfer located at path 'path' '''
+		"""
+		Make buttons/menuitems sensitive as appropriate to the state of file
+		transfer located at path 'path'
+		"""
 		if path is None:
 			self.set_all_insensitive()
 			return
@@ -716,7 +711,7 @@ _('Connection with peer cannot be established.'))
 		self.remove_menuitem.set_sensitive(is_row_selected)
 		self.open_folder_menuitem.set_sensitive(is_row_selected)
 		is_stopped = False
-		if self.is_transfer_stopped(file_props):
+		if is_transfer_stopped(file_props):
 			is_stopped = True
 		self.cancel_button.set_sensitive(not is_stopped)
 		self.cancel_menuitem.set_sensitive(not is_stopped)
@@ -724,11 +719,11 @@ _('Connection with peer cannot be established.'))
 			# no selection, disable the buttons
 			self.set_all_insensitive()
 		elif not is_stopped:
-			if self.is_transfer_active(file_props):
+			if is_transfer_active(file_props):
 				# file transfer is active
 				self.toggle_pause_continue(True)
 				self.pause_button.set_sensitive(True)
-			elif self.is_transfer_paused(file_props):
+			elif is_transfer_paused(file_props):
 				# file transfer is paused
 				self.toggle_pause_continue(False)
 				self.pause_button.set_sensitive(True)
@@ -743,8 +738,9 @@ _('Connection with peer cannot be established.'))
 		return True
 
 	def selection_changed(self, args):
-		''' selection has changed - change the sensitivity of the
-		buttons/menuitems'''
+		"""
+		Selection has changed - change the sensitivity of the buttons/menuitems
+		"""
 		selection = args
 		selected = selection.get_selected_rows()
 		if selected[1] != []:
@@ -770,7 +766,7 @@ _('Connection with peer cannot be established.'))
 			iter_ = self.model.get_iter((i))
 			sid = self.model[iter_][C_SID].decode('utf-8')
 			file_props = self.files_props[sid[0]][sid[1:]]
-			if self.is_transfer_stopped(file_props):
+			if is_transfer_stopped(file_props):
 				self._remove_transfer(iter_, sid, file_props)
 			i -= 1
 		self.tree.get_selection().unselect_all()
@@ -812,7 +808,7 @@ _('Connection with peer cannot be established.'))
 			self.set_status(file_props['type'], file_props['sid'], types[sid[0]])
 			self.toggle_pause_continue(True)
 			file_props['continue_cb']()
-		elif self.is_transfer_active(file_props):
+		elif is_transfer_active(file_props):
 			file_props['paused'] = True
 			self.set_status(file_props['type'], file_props['sid'], 'pause')
 			# reset that to compute speed only when we resume
@@ -848,7 +844,7 @@ _('Connection with peer cannot be established.'))
 			sid = self.model[iter_][C_SID].decode('utf-8')
 			file_props = self.files_props[sid[0]][sid[1:]]
 			# bounding rectangle of coordinates for the cell within the treeview
-			rect =  self.tree.get_cell_area(props[0],props[1])
+			rect = self.tree.get_cell_area(props[0], props[1])
 			# position of the treeview on the screen
 			position = widget.window.get_origin()
 			self.tooltip.show_tooltip(file_props , rect.height,
@@ -870,10 +866,9 @@ _('Connection with peer cannot be established.'))
 
 	def show_context_menu(self, event, iter_):
 		# change the sensitive propery of the buttons and menuitems
-		path = None
-		if iter_ is not None:
+		if iter_:
 			path = self.model.get_path(iter_)
-		self.set_buttons_sensitive(path, True)
+			self.set_buttons_sensitive(path, True)
 
 		event_button = gtkgui_helpers.get_possible_button_event(event)
 		self.file_transfers_menu.show_all()
@@ -881,7 +876,9 @@ _('Connection with peer cannot be established.'))
 			event_button, event.time)
 
 	def on_transfers_list_key_press_event(self, widget, event):
-		'''when a key is pressed in the treeviews'''
+		"""
+		When a key is pressed in the treeviews
+		"""
 		self.tooltip.hide_tooltip()
 		iter_ = None
 		try:
@@ -920,16 +917,16 @@ _('Connection with peer cannot be established.'))
 		except TypeError:
 			self.tree.get_selection().unselect_all()
 		if event.button == 3: # Right click
-			if path is not None:
+			if path:
 				self.tree.get_selection().select_path(path)
 				iter_ = self.model.get_iter(path)
 			self.show_context_menu(event, iter_)
-			if path is not None:
+			if path:
 				return True
 
 	def on_open_folder_menuitem_activate(self, widget):
 		selected = self.tree.get_selection().get_selected()
-		if selected is None or selected[1] is None:
+		if not selected or not selected[1]:
 			return
 		s_iter = selected[1]
 		sid = self.model[s_iter][C_SID].decode('utf-8')
@@ -951,7 +948,7 @@ _('Connection with peer cannot be established.'))
 
 	def on_remove_menuitem_activate(self, widget):
 		selected = self.tree.get_selection().get_selected()
-		if selected is None or selected[1] is None:
+		if not selected or not selected[1]:
 			return
 		s_iter = selected[1]
 		sid = self.model[s_iter][C_SID].decode('utf-8')
@@ -963,5 +960,4 @@ _('Connection with peer cannot be established.'))
 		if event.keyval == gtk.keysyms.Escape: # ESCAPE
 			self.window.hide()
 
-
 # vim: se ts=3:
diff --git a/src/gajim-remote.py b/src/gajim-remote.py
index e70545a2f..a3f2d3fac 100644
--- a/src/gajim-remote.py
+++ b/src/gajim-remote.py
@@ -60,7 +60,6 @@ INTERFACE = 'org.gajim.dbus.RemoteInterface'
 SERVICE = 'org.gajim.dbus'
 BASENAME = 'gajim-remote-plugin'
 
-
 class GajimRemote:
 
 	def __init__(self):
@@ -107,7 +106,7 @@ class GajimRemote:
 					_('Changes the status of account or accounts'),
 					[
 #offline, online, chat, away, xa, dnd, invisible should not be translated
-						(_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible '), True),
+						(_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible. If not set, use accoun\'t previous status'), False),
 						(_('message'), _('status message'), False),
 						(_('account'), _('change status of account "account". '
 		'If not specified, try to change status of all accounts that have '
@@ -265,6 +264,15 @@ class GajimRemote:
 							False)
 					]
 				],
+			'change_avatar': [
+					_('Change the avatar'),
+					[
+						('picture', _('Picture to use'), True),
+						('account', _('Account in which the avatar will be set; '
+						'if not specified, the avatar will be set for all accounts'),
+							False)
+					]
+				],
 			'handle_uri': [
 					_('Handle a xmpp:/ uri'),
 					[
@@ -327,7 +335,9 @@ class GajimRemote:
 			self.print_result(res)
 
 	def print_result(self, res):
-		''' Print retrieved result to the output '''
+		"""
+		Print retrieved result to the output
+		"""
 		if res is not None:
 			if self.command in ('open_chat', 'send_chat_message', 'send_single_message', 'start_chat'):
 				if self.command in ('send_message', 'send_single_message'):
@@ -382,8 +392,9 @@ class GajimRemote:
 		return test
 
 	def init_connection(self):
-		''' create the onnection to the session dbus,
-		or exit if it is not possible '''
+		"""
+		Create the onnection to the session dbus, or exit if it is not possible
+		"""
 		try:
 			self.sbus = dbus.SessionBus()
 		except Exception:
@@ -400,8 +411,10 @@ class GajimRemote:
 		self.method = interface.__getattr__(self.command)
 
 	def make_arguments_row(self, args):
-		''' return arguments list. Mandatory arguments are enclosed with:
-		'<', '>', optional arguments - with '[', ']' '''
+		"""
+		Return arguments list. Mandatory arguments are enclosed with:
+		'<', '>', optional arguments - with '[', ']'
+		"""
 		s = ''
 		for arg in args:
 			if arg[2]:
@@ -411,7 +424,9 @@ class GajimRemote:
 		return s
 
 	def help_on_command(self, command):
-		''' return help message for a given command '''
+		"""
+		Return help message for a given command
+		"""
 		if command in self.commands:
 			command_props = self.commands[command]
 			arguments_str = self.make_arguments_row(command_props[1])
@@ -426,7 +441,9 @@ class GajimRemote:
 		send_error(_('%s not found') % command)
 
 	def compose_help(self):
-		''' print usage, and list available commands '''
+		"""
+		Print usage, and list available commands
+		"""
 		s = _('Usage: %s command [arguments]\nCommand is one of:\n' ) % BASENAME
 		for command in sorted(self.commands):
 			s += '  ' + command
@@ -439,7 +456,9 @@ class GajimRemote:
 		return s
 
 	def print_info(self, level, prop_dict, encode_return = False):
-		''' return formated string from data structure '''
+		"""
+		Return formated string from data structure
+		"""
 		if prop_dict is None or not isinstance(prop_dict, (dict, list, tuple)):
 			return ''
 		ret_str = ''
@@ -488,7 +507,9 @@ class GajimRemote:
 		return ret_str
 
 	def check_arguments(self):
-		''' Make check if all necessary arguments are given '''
+		"""
+		Make check if all necessary arguments are given
+		"""
 		argv_len = self.argv_len - 2
 		args = self.commands[self.command][1]
 		if len(args) < argv_len:
@@ -561,7 +582,9 @@ class GajimRemote:
 		sys.exit(0)
 
 	def call_remote_method(self):
-		''' calls self.method with arguments from sys.argv[2:] '''
+		"""
+		Calls self.method with arguments from sys.argv[2:]
+		"""
 		args = [i.decode(PREFERRED_ENCODING) for i in self.arguments]
 		args = [dbus.String(i) for i in args]
 		try:
diff --git a/src/gajim.py b/src/gajim.py
index a2e58f4e7..2f2689ecb 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -176,12 +176,12 @@ else:
 		elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'):
 			libc.setproctitle('gajim')
 
-	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...')
+	if gtk.pygtk_version < (2, 16, 0):
+		pritext = _('Gajim needs PyGTK 2.16 or above')
+		sectext = _('Gajim needs PyGTK 2.16 or above to run. Quiting...')
+	elif gtk.gtk_version < (2, 16, 0):
+		pritext = _('Gajim needs GTK 2.16 or above')
+		sectext = _('Gajim needs GTK 2.16 or above to run. Quiting...')
 
 	try:
 		import gtk.glade # check if user has libglade (in pygtk and in gtk)
@@ -322,8 +322,7 @@ def pid_alive():
 	return True
 
 if pid_alive():
-	path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps/gajim.png')
-	pix = gtk.gdk.pixbuf_new_from_file(path_to_file)
+	pix = gtkgui_helpers.get_icon_pixmap('gajim', 48)
 	gtk.window_set_default_icon(pix) # set the icon to all newly opened wind
 	pritext = _('Gajim is already running')
 	sectext = _('Another instance of Gajim seems to be running\nRun anyway?')
@@ -383,6 +382,7 @@ if __name__ == '__main__':
 		# Session Management support
 		try:
 			import gnome.ui
+			raise ImportError
 		except ImportError:
 			pass
 		else:
diff --git a/src/gajim_themes_window.py b/src/gajim_themes_window.py
index ebaebc8d6..e6c23929a 100644
--- a/src/gajim_themes_window.py
+++ b/src/gajim_themes_window.py
@@ -275,7 +275,9 @@ class GajimThemesWindow:
 			self._set_font()
 
 	def _set_color(self, state, widget, option):
-		''' set color value in prefs and update the UI '''
+		"""
+		Set color value in prefs and update the UI
+		"""
 		if state:
 			color = widget.get_color()
 			color_string = gtkgui_helpers.make_color_string(color)
@@ -297,7 +299,9 @@ class GajimThemesWindow:
 		gajim.interface.save_config()
 
 	def _set_font(self):
-		''' set font value in prefs and update the UI '''
+		"""
+		Set font value in prefs and update the UI
+		"""
 		state = self.textfont_checkbutton.get_active()
 		if state:
 			font_string = self.text_fontbutton.get_font_name()
@@ -317,13 +321,16 @@ class GajimThemesWindow:
 		gajim.interface.save_config()
 
 	def _toggle_font_widgets(self, font_props):
-		''' toggle font buttons with the bool values of font_props tuple'''
+		"""
+		Toggle font buttons with the bool values of font_props tuple
+		"""
 		self.bold_togglebutton.set_active(font_props[0])
 		self.italic_togglebutton.set_active(font_props[1])
 
 	def _get_font_description(self):
-		''' return a FontDescription from togglebuttons
-		states'''
+		"""
+		Return a FontDescription from togglebuttons states
+		"""
 		fd = pango.FontDescription()
 		if self.bold_togglebutton.get_active():
 			fd.set_weight(pango.WEIGHT_BOLD)
@@ -332,8 +339,10 @@ class GajimThemesWindow:
 		return fd
 
 	def _set_font_widgets(self, font_attrs):
-		''' set the correct toggle state of font style buttons by
-		a font string of type 'BI' '''
+		"""
+		Set the correct toggle state of font style buttons by a font string of
+		type 'BI'
+		"""
 		font_props = [False, False, False]
 		if font_attrs:
 			if font_attrs.find('B') != -1:
@@ -343,7 +352,9 @@ class GajimThemesWindow:
 		self._toggle_font_widgets(font_props)
 
 	def _get_font_attrs(self):
-		''' get a string with letters of font attribures: 'BI' '''
+		"""
+		Get a string with letters of font attribures: 'BI'
+		"""
 		attrs = ''
 		if self.bold_togglebutton.get_active():
 			attrs += 'B'
@@ -353,7 +364,9 @@ class GajimThemesWindow:
 
 
 	def _get_font_props(self, font_name):
-		''' get tuple of font properties: Weight, Style '''
+		"""
+		Get tuple of font properties: weight, style
+		"""
 		font_props = [False, False, False]
 		font_description = pango.FontDescription(font_name)
 		if font_description.get_weight() != pango.WEIGHT_NORMAL:
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index ed1f07f88..fc520a444 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -29,6 +29,7 @@
 
 import os
 import time
+import locale
 import gtk
 import pango
 import gobject
@@ -63,7 +64,9 @@ C_AVATAR, # avatar of the contact
 ) = range(5)
 
 def set_renderer_color(treeview, renderer, set_background=True):
-	'''set style for group row, using PRELIGHT system color'''
+	"""
+	Set style for group row, using PRELIGHT system color
+	"""
 	if set_background:
 		bgcolor = treeview.style.bg[gtk.STATE_PRELIGHT]
 		renderer.set_property('cell-background-gdk', bgcolor)
@@ -119,15 +122,16 @@ def tree_cell_data_func(column, renderer, model, iter_, tv=None):
 			renderer.set_property('font',
 				gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont'))
 
+
 class PrivateChatControl(ChatControl):
 	TYPE_ID = message_control.TYPE_PM
 
-   # Set a command host to bound to. Every command given through a private chat
-   # will be processed with this command host.
+	# Set a command host to bound to. Every command given through a private chat
+	# will be processed with this command host.
 	COMMAND_HOST = PrivateChatCommands
 
 	def __init__(self, parent_win, gc_contact, contact, account, session):
-		room_jid = contact.jid.split('/')[0]
+		room_jid = gc_contact.room_jid
 		room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account)
 		if room_jid in gajim.interface.minimized_controls[account]:
 			room_ctrl = gajim.interface.minimized_controls[account][room_jid]
@@ -140,12 +144,10 @@ class PrivateChatControl(ChatControl):
 		self.TYPE_ID = 'pm'
 
 	def send_message(self, message, xhtml=None, process_commands=True):
-		'''call this function to send our message'''
-		if not message:
-			return
-
+		"""
+		Call this method to send the message
+		"""
 		message = helpers.remove_invalid_xml_chars(message)
-
 		if not message:
 			return
 
@@ -153,7 +155,7 @@ class PrivateChatControl(ChatControl):
 		# the recipient did not go away
 		contact = gajim.contacts.get_first_contact_from_jid(self.account,
 			self.contact.jid)
-		if contact is None:
+		if not contact:
 			# contact was from pm in MUC
 			room, nick = gajim.get_room_and_nick_from_fjid(self.contact.jid)
 			gc_contact = gajim.contacts.get_gc_contact(self.account, room, nick)
@@ -191,8 +193,8 @@ class PrivateChatControl(ChatControl):
 class GroupchatControl(ChatControlBase):
 	TYPE_ID = message_control.TYPE_GC
 
-   # Set a command host to bound to. Every command given through a group chat
-   # will be processed with this command host.
+	# Set a command host to bound to. Every command given through a group chat
+	# will be processed with this command host.
 	COMMAND_HOST = GroupChatCommands
 
 	def __init__(self, parent_win, contact, acct, is_continued=False):
@@ -317,6 +319,7 @@ class GroupchatControl(ChatControlBase):
 		id_ = self.list_treeview.connect('style-set',
 			self.on_list_treeview_style_set)
 		self.handlers[id_] = self.list_treeview
+		self.resize_from_another_muc = False
 		# we want to know when the the widget resizes, because that is
 		# an indication that the hpaned has moved...
 		# FIXME: Find a better indicator that the hpaned has moved.
@@ -381,7 +384,9 @@ class GroupchatControl(ChatControlBase):
 		self.widget.show_all()
 
 	def tree_compare_iters(self, model, iter1, iter2):
-		'''Compare two iters to sort them'''
+		"""
+		Compare two iters to sort them
+		"""
 		type1 = model[iter1][C_TYPE]
 		type2 = model[iter2][C_TYPE]
 		if not type1 or not type2:
@@ -393,9 +398,7 @@ class GroupchatControl(ChatControlBase):
 		nick1 = nick1.decode('utf-8')
 		nick2 = nick2.decode('utf-8')
 		if type1 == 'role':
-			if nick1 < nick2:
-				return -1
-			return 1
+			return locale.strcoll(nick1, nick2)
 		if type1 == 'contact':
 			gc_contact1 = gajim.contacts.get_gc_contact(self.account,
 				self.room_jid, nick1)
@@ -419,15 +422,13 @@ class GroupchatControl(ChatControlBase):
 		# We compare names
 		name1 = gc_contact1.get_shown_name()
 		name2 = gc_contact2.get_shown_name()
-		if name1.lower() < name2.lower():
-			return -1
-		if name2.lower() < name1.lower():
-			return 1
-		return 0
+		return locale.strcoll(name1.lower(), name2.lower())
 
 	def on_msg_textview_populate_popup(self, textview, menu):
-		'''we override the default context menu and we prepend Clear
-		and the ability to insert a nick'''
+		"""
+		Override the default context menu and we prepend Clear
+		and the ability to insert a nick
+		"""
 		ChatControlBase.on_msg_textview_populate_popup(self, textview, menu)
 		item = gtk.SeparatorMenuItem()
 		menu.prepend(item)
@@ -446,20 +447,36 @@ class GroupchatControl(ChatControlBase):
 
 		menu.show_all()
 
+	def resize_occupant_treeview(self, position):
+		self.resize_from_another_muc = True
+		self.hpaned.set_position(position)
+		def reset_flag():
+			self.resize_from_another_muc = False
+		# Reset the flag when everything will be redrawn, and in particular when
+		# on_treeview_size_allocate will have been called.
+		gobject.idle_add(reset_flag)
+
 	def on_treeview_size_allocate(self, widget, allocation):
-		'''The MUC treeview has resized. Move the hpaned in all tabs to match'''
+		"""
+		The MUC treeview has resized. Move the hpaned in all tabs to match
+		"""
+		if self.resize_from_another_muc:
+			# Don't send the event to other MUC
+			return
 		hpaned_position = self.hpaned.get_position()
 		for account in gajim.gc_connected:
 			for room_jid in [i for i in gajim.gc_connected[account] if \
-			gajim.gc_connected[account][i]]:
+			gajim.gc_connected[account][i] and i != self.room_jid]:
 				ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account)
 				if not ctrl:
 					ctrl = gajim.interface.minimized_controls[account][room_jid]
 				if ctrl:
-					ctrl.hpaned.set_position(hpaned_position)
+					ctrl.resize_occupant_treeview(hpaned_position)
 
 	def iter_contact_rows(self):
-		'''iterate over all contact rows in the tree model'''
+		"""
+		Iterate over all contact rows in the tree model
+		"""
 		model = self.list_treeview.get_model()
 		role_iter = model.get_iter_root()
 		while role_iter:
@@ -470,7 +487,9 @@ class GroupchatControl(ChatControlBase):
 			role_iter = model.iter_next(role_iter)
 
 	def on_list_treeview_style_set(self, treeview, style):
-		'''When style (theme) changes, redraw all contacts'''
+		"""
+		When style (theme) changes, redraw all contacts
+		"""
 		# Get the room_jid from treeview
 		for contact in self.iter_contact_rows():
 			nick = contact[C_NICK].decode('utf-8')
@@ -492,10 +511,11 @@ class GroupchatControl(ChatControlBase):
 		self.draw_contact(nick, selected=True, focus=True)
 
 	def get_tab_label(self, chatstate):
-		'''Markup the label if necessary. Returns a tuple such as:
-		(new_label_str, color)
-		either of which can be None
-		if chatstate is given that means we have HE SENT US a chatstate'''
+		"""
+		Markup the label if necessary. Returns a tuple such as: (new_label_str,
+		color) either of which can be None if chatstate is given that means we
+		have HE SENT US a chatstate
+		"""
 
 		has_focus = self.parent_win.window.get_property('has-toplevel-focus')
 		current_tab = self.parent_win.get_active_control() == self
@@ -580,10 +600,10 @@ class GroupchatControl(ChatControlBase):
 		banner_status_img.set_from_pixbuf(scaled_pix)
 
 	def get_continued_conversation_name(self):
-		'''Get the name of a continued conversation.
-		Will return Continued Conversation if there isn't any other
-		contact in the room
-		'''
+		"""
+		Get the name of a continued conversation.  Will return Continued
+		Conversation if there isn't any other contact in the room
+		"""
 		nicks = []
 		for nick in gajim.contacts.get_nick_list(self.account,
 		self.room_jid):
@@ -597,9 +617,10 @@ class GroupchatControl(ChatControlBase):
 		return title
 
 	def draw_banner_text(self):
-		'''Draw the text in the fat line at the top of the window that
-		houses the room jid, subject.
-		'''
+		"""
+		Draw the text in the fat line at the top of the window that houses the
+		room jid, subject
+		"""
 		self.name_label.set_ellipsize(pango.ELLIPSIZE_END)
 		self.banner_status_label.set_ellipsize(pango.ELLIPSIZE_END)
 		font_attrs, font_attrs_small = self.get_font_attrs()
@@ -613,17 +634,13 @@ class GroupchatControl(ChatControlBase):
 		if self.subject:
 			subject = helpers.reduce_chars_newlines(self.subject, max_lines=2)
 			subject = gobject.markup_escape_text(subject)
-			if gajim.HAVE_PYSEXY:
-				subject_text = self.urlfinder.sub(self.make_href, subject)
-				subject_text = '<span %s>%s</span>' % (font_attrs_small,
-					subject_text)
-			else:
-				subject_text = '<span %s>%s</span>' % (font_attrs_small, subject)
+			subject_text = self.urlfinder.sub(self.make_href, subject)
+			subject_text = '<span %s>%s</span>' % (font_attrs_small, subject_text)
 
 			# tooltip must always hold ALL the subject
 			self.event_box.set_tooltip_text(self.subject)
-			self.banner_status_label.show()
 			self.banner_status_label.set_no_show_all(False)
+			self.banner_status_label.show()
 		else:
 			subject_text = ''
 			self.event_box.set_has_tooltip(False)
@@ -633,7 +650,9 @@ class GroupchatControl(ChatControlBase):
 		self.banner_status_label.set_markup(subject_text)
 
 	def prepare_context_menu(self, hide_buttonbar_items=False):
-		'''sets sensitivity state for configure_room'''
+		"""
+		Set sensitivity state for configure_room
+		"""
 		xml = gtkgui_helpers.get_glade('gc_control_popup_menu.glade')
 		menu = xml.get_widget('gc_control_popup_menu')
 
@@ -737,7 +756,7 @@ class GroupchatControl(ChatControlBase):
 		return menu
 
 	def destroy_menu(self, menu, change_nick_menuitem, change_subject_menuitem,
-	bookmark_room_menuitem, history_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,
@@ -752,7 +771,7 @@ class GroupchatControl(ChatControlBase):
 		menu.destroy()
 
 	def on_message(self, nick, msg, tim, has_timestamp=False, xhtml=None,
-	status_code=[]):
+			status_code=[]):
 		if '100' in status_code:
 			# Room is not anonymous
 			self.is_anonymous = False
@@ -768,8 +787,8 @@ class GroupchatControl(ChatControlBase):
 			else:
 				self.print_conversation(msg, nick, tim, xhtml)
 
-	def on_private_message(self, nick, msg, tim, xhtml, session,
-	msg_id=None, encrypted=False):
+	def on_private_message(self, nick, msg, tim, xhtml, session, msg_id=None,
+			encrypted=False):
 		# Do we have a queue?
 		fjid = self.room_jid + '/' + nick
 		no_queue = len(gajim.events.get_events(self.account, fjid)) == 0
@@ -807,28 +826,18 @@ class GroupchatControl(ChatControlBase):
 
 	def get_contact_iter(self, nick):
 		model = self.list_treeview.get_model()
-		fin = False
 		role_iter = model.get_iter_root()
-		if not role_iter:
-			return None
-		while not fin:
-			fin2 = False
+		while role_iter:
 			user_iter = model.iter_children(role_iter)
-			if not user_iter:
-				fin2 = True
-			while not fin2:
+			while user_iter:
 				if nick == model[user_iter][C_NICK].decode('utf-8'):
 					return user_iter
-				user_iter = model.iter_next(user_iter)
-				if not user_iter:
-					fin2 = True
+				else:
+					user_iter = model.iter_next(user_iter)
 			role_iter = model.iter_next(role_iter)
-			if not role_iter:
-				fin = True
 		return None
 
-	def print_old_conversation(self, text, contact='', tim=None,
-	xhtml = None):
+	def print_old_conversation(self, text, contact='', tim=None, xhtml = None):
 		if isinstance(text, str):
 			text = unicode(text, 'utf-8')
 		if contact:
@@ -847,11 +856,14 @@ class GroupchatControl(ChatControlBase):
 			small_attr + ['restored_message'], count_as_new=False, xhtml=xhtml)
 
 	def print_conversation(self, text, contact='', tim=None, xhtml=None,
-	graphics=True):
-		'''Print a line in the conversation:
-		if contact is set: it's a message from someone or an info message (contact
-		= 'info' in such a case)
-		if contact is not set: it's a message from the server or help'''
+			graphics=True):
+		"""
+		Print a line in the conversation
+
+		If contact is set: it's a message from someone or an info message
+		(contact = 'info' in such a case).
+		If contact is not set: it's a message from the server or help.
+		"""
 		if isinstance(text, str):
 			text = unicode(text, 'utf-8')
 		other_tags_for_name = []
@@ -930,8 +942,10 @@ class GroupchatControl(ChatControlBase):
 		return nb
 
 	def highlighting_for_message(self, text, tim):
-		'''Returns a 2-Tuple. The first says whether or not to highlight the
-		text, the second, what sound to play.'''
+		"""
+		Returns a 2-Tuple. The first says whether or not to highlight the text,
+		the second, what sound to play
+		"""
 		highlight, sound = (None, None)
 
 		# Are any of the defined highlighting words in the text?
@@ -953,10 +967,11 @@ class GroupchatControl(ChatControlBase):
 		return (highlight, sound)
 
 	def check_and_possibly_add_focus_out_line(self):
-		'''checks and possibly adds focus out line for room_jid if it needs it
-		and does not already have it as last event. If it goes to add this line
-		it removes previous line first'''
-
+		"""
+		Check and possibly add focus out line for room_jid if it needs it and
+		does not already have it as last event. If it goes to add this line
+		- remove previous line first
+		"""
 		win = gajim.interface.msg_win_mgr.get_window(self.room_jid, self.account)
 		if win and self.room_jid == win.get_active_jid() and\
 		win.window.get_property('has-toplevel-focus') and\
@@ -968,9 +983,10 @@ class GroupchatControl(ChatControlBase):
 		self.conv_textview.show_focus_out_line()
 
 	def needs_visual_notification(self, text):
-		'''checks text to see whether any of the words in (muc_highlight_words
-		and nick) appear.'''
-
+		"""
+		Check text to see whether any of the words in (muc_highlight_words and
+		nick) appear
+		"""
 		special_words = gajim.config.get('muc_highlight_words').split(';')
 		special_words.append(self.nick)
 		# Strip empties: ''.split(';') == [''] and would highlight everything.
@@ -1064,9 +1080,11 @@ class GroupchatControl(ChatControlBase):
 		self.list_treeview.columns_autosize()
 
 	def on_send_pm(self, widget=None, model=None, iter_=None, nick=None,
-	msg=None):
-		'''opens a chat window and if msg is not None sends private message to a
-		contact in a room'''
+			msg=None):
+		"""
+		Open a chat window and if msg is not None - send private message to a
+		contact in a room
+		"""
 		if nick is None:
 			nick = model[iter_][C_NICK].decode('utf-8')
 
@@ -1075,7 +1093,9 @@ class GroupchatControl(ChatControlBase):
 			ctrl.send_message(msg)
 
 	def on_send_file(self, widget, gc_contact):
-		'''sends a file to a contact in the room'''
+		"""
+		Send a file to a contact in the room
+		"""
 		self._on_send_file(gc_contact)
 
 	def draw_contact(self, nick, selected=False, focus=False):
@@ -1112,7 +1132,8 @@ class GroupchatControl(ChatControlBase):
 				         '%s</span>') % (colorstring, gobject.markup_escape_text(status))
 
 		if image.get_storage_type() == gtk.IMAGE_PIXBUF and \
-		gc_contact.affiliation != 'none':
+		gc_contact.affiliation != 'none' and gajim.config.get(
+		'show_affiliation_in_groupchat'):
 			pixbuf1 = image.get_pixbuf().copy()
 			pixbuf2 = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 4, 4)
 			if gc_contact.affiliation == 'owner':
@@ -1135,8 +1156,8 @@ class GroupchatControl(ChatControlBase):
 		iter_ = self.get_contact_iter(nick)
 		if not iter_:
 			return
-		pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.room_jid + \
-			'/' + nick, True)
+		fake_jid = self.room_jid + '/' + nick
+		pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fake_jid)
 		if pixbuf in ('ask', None):
 			scaled_pixbuf = None
 		else:
@@ -1160,8 +1181,10 @@ class GroupchatControl(ChatControlBase):
 			self.draw_role(role)
 
 	def chg_contact_status(self, nick, show, status, role, affiliation, jid,
-	reason, actor, statusCode, new_nick, avatar_sha, tim=None):
-		'''When an occupant changes his or her status'''
+			reason, actor, statusCode, new_nick, avatar_sha, tim=None):
+		"""
+		When an occupant changes his or her status
+		"""
 		if show == 'invisible':
 			return
 
@@ -1298,7 +1321,9 @@ class GroupchatControl(ChatControlBase):
 						'nick': nick,
 						'reason': _('system shutdown') }
 					self.print_conversation(s, 'info', tim=tim, graphics=False)
-				elif 'destroyed' in statusCode: # Room has been destroyed
+				# Room has been destroyed.
+				elif 'destroyed' in statusCode:
+					self.autorejoin = False
 					self.print_conversation(reason, 'info', tim, graphics=False)
 
 			if len(gajim.events.get_events(self.account, jid=fake_jid,
@@ -1440,7 +1465,7 @@ class GroupchatControl(ChatControlBase):
 				self.print_conversation(st, tim=tim, graphics=False)
 
 	def add_contact_to_roster(self, nick, show, role, affiliation, status,
-	jid=''):
+			jid=''):
 		model = self.list_treeview.get_model()
 		role_name = helpers.get_uf_role(role, plural=True)
 
@@ -1474,7 +1499,7 @@ class GroupchatControl(ChatControlBase):
 		if gajim.config.get('ask_avatars_on_startup') and \
 		not server.startswith('irc'):
 			fake_jid = self.room_jid + '/' + nick
-			pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fake_jid, True)
+			pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fake_jid)
 			if pixbuf == 'ask':
 				if j:
 					fjid = j
@@ -1492,21 +1517,18 @@ class GroupchatControl(ChatControlBase):
 
 	def get_role_iter(self, role):
 		model = self.list_treeview.get_model()
-		fin = False
-		iter_ = model.get_iter_root()
-		if not iter_:
-			return None
-		while not fin:
-			role_name = model[iter_][C_NICK].decode('utf-8')
+		role_iter = model.get_iter_root()
+		while role_iter:
+			role_name = model[role_iter][C_NICK].decode('utf-8')
 			if role == role_name:
-				return iter_
-			iter_ = model.iter_next(iter_)
-			if not iter_:
-				fin = True
+				return role_iter
+			role_iter = model.iter_next(role_iter)
 		return None
 
 	def remove_contact(self, nick):
-		'''Remove a user from the contacts_list'''
+		"""
+		Remove a user from the contacts_list
+		"""
 		model = self.list_treeview.get_model()
 		iter_ = self.get_contact_iter(nick)
 		if not iter_:
@@ -1521,7 +1543,9 @@ class GroupchatControl(ChatControlBase):
 			model.remove(parent_iter)
 
 	def send_message(self, message, xhtml=None, process_commands=True):
-		'''call this function to send our message'''
+		"""
+		Call this function to send our message
+		"""
 		if not message:
 			return
 
@@ -1535,9 +1559,9 @@ class GroupchatControl(ChatControlBase):
 
 		if message != '' or message != '\n':
 			self.save_sent_message(message)
-         
+
 			# Send the message
-			gajim.connections[self.account].send_gc_message(self.room_jid, 
+			gajim.connections[self.account].send_gc_message(self.room_jid,
 				message, xhtml=xhtml)
 			self.msg_textview.get_buffer().set_text('')
 			self.msg_textview.grab_focus()
@@ -1748,7 +1772,9 @@ class GroupchatControl(ChatControlBase):
 			_('You may also enter an alternate venue:'), ok_handler=on_ok)
 
 	def _on_bookmark_room_menuitem_activate(self, widget):
-		'''bookmark the room, without autojoin and not minimized'''
+		"""
+		Bookmark the room, without autojoin and not minimized
+		"""
 		password = gajim.gc_passwords.get(self.room_jid, '')
 		gajim.interface.add_gc_bookmark(self.account, self.name, self.room_jid, \
 			'0', '0', password, self.nick)
@@ -1771,7 +1797,7 @@ class GroupchatControl(ChatControlBase):
 		gajim.connections[self.account].send_invite(self.room_jid, contact_jid)
 
 	def handle_message_textview_mykey_press(self, widget, event_keyval,
-		event_keymod):
+			event_keymod):
 		# NOTE: handles mykeypress which is custom signal connected to this
 		# CB in new_room(). for this singal see message_textview.py
 
@@ -1808,12 +1834,15 @@ class GroupchatControl(ChatControlBase):
 
 			gc_refer_to_nick_char = gajim.config.get('gc_refer_to_nick_char')
 			with_refer_to_nick_char = False
+			after_nick_len = 1 # the space that is printed after we type [Tab]
 
 			# first part of this if : works fine even if refer_to_nick_char
-			if gc_refer_to_nick_char and begin.endswith(gc_refer_to_nick_char):
+			if gc_refer_to_nick_char and text.endswith(
+			gc_refer_to_nick_char + ' '):
 				with_refer_to_nick_char = True
+				after_nick_len = len(gc_refer_to_nick_char + ' ')
 			if len(self.nick_hits) and self.last_key_tabs and \
-			text[:-len(gc_refer_to_nick_char + ' ')].endswith(self.nick_hits[0]):
+			text[:-after_nick_len].endswith(self.nick_hits[0]):
 				# we should cycle
 				# Previous nick in list may had a space inside, so we check text and
 				# not splitted_text and store it into 'begin' var
@@ -1900,19 +1929,25 @@ class GroupchatControl(ChatControlBase):
 				return True
 
 	def on_list_treeview_row_expanded(self, widget, iter_, path):
-		'''When a row is expanded: change the icon of the arrow'''
+		"""
+		When a row is expanded: change the icon of the arrow
+		"""
 		model = widget.get_model()
 		image = gajim.interface.jabber_state_images['16']['opened']
 		model[iter_][C_IMG] = image
 
 	def on_list_treeview_row_collapsed(self, widget, iter_, path):
-		'''When a row is collapsed: change the icon of the arrow'''
+		"""
+		When a row is collapsed: change the icon of the arrow
+		"""
 		model = widget.get_model()
 		image = gajim.interface.jabber_state_images['16']['closed']
 		model[iter_][C_IMG] = image
 
 	def kick(self, widget, nick):
-		'''kick a user'''
+		"""
+		Kick a user
+		"""
 		def on_ok(reason):
 			gajim.connections[self.account].gc_set_role(self.room_jid, nick,
 				'none', reason)
@@ -1922,7 +1957,9 @@ class GroupchatControl(ChatControlBase):
 					_('You may specify a reason below:'), ok_handler=on_ok)
 
 	def mk_menu(self, event, iter_):
-		'''Make contact's popup menu'''
+		"""
+		Make contact's popup menu
+		"""
 		model = self.list_treeview.get_model()
 		nick = model[iter_][C_NICK].decode('utf-8')
 		c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
@@ -2036,7 +2073,7 @@ class GroupchatControl(ChatControlBase):
 
 		item = xml.get_widget('send_file_menuitem')
 		# add a special img for send file menuitem
-		path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png')
+		path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload')
 		img = gtk.Image()
 		img.set_from_file(path_to_upload_img)
 		item.set_image(img)
@@ -2066,8 +2103,10 @@ class GroupchatControl(ChatControlBase):
 		return ctrl
 
 	def on_row_activated(self, widget, path):
-		'''When an iter is activated (dubblick or single click if gnome is set
-		this way'''
+		"""
+		When an iter is activated (dubblick or single click if gnome is set this
+		way
+		"""
 		model = widget.get_model()
 		if len(path) == 1: # It's a group
 			if (widget.row_expanded(path)):
@@ -2079,12 +2118,16 @@ class GroupchatControl(ChatControlBase):
 			self._start_private_message(nick)
 
 	def on_list_treeview_row_activated(self, widget, path, col=0):
-		'''When an iter is double clicked: open the chat window'''
+		"""
+		When an iter is double clicked: open the chat window
+		"""
 		if not gajim.single_click:
 			self.on_row_activated(widget, path)
 
 	def on_list_treeview_button_press_event(self, widget, event):
-		'''popup user's group's or agent menu'''
+		"""
+		Popup user's group's or agent menu
+		"""
 		# hide tooltip, no matter the button is pressed
 		self.tooltip.hide_tooltip()
 		try:
@@ -2195,27 +2238,37 @@ class GroupchatControl(ChatControlBase):
 			self.tooltip.hide_tooltip()
 
 	def grant_voice(self, widget, nick):
-		'''grant voice privilege to a user'''
+		"""
+		Grant voice privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_role(self.room_jid, nick,
 			'participant')
 
 	def revoke_voice(self, widget, nick):
-		'''revoke voice privilege to a user'''
+		"""
+		Revoke voice privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_role(self.room_jid, nick,
 			'visitor')
 
 	def grant_moderator(self, widget, nick):
-		'''grant moderator privilege to a user'''
+		"""
+		Grant moderator privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_role(self.room_jid, nick,
 			'moderator')
 
 	def revoke_moderator(self, widget, nick):
-		'''revoke moderator privilege to a user'''
+		"""
+		Revoke moderator privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_role(self.room_jid, nick,
 			'participant')
 
 	def ban(self, widget, jid):
-		'''ban a user'''
+		"""
+		Ban a user
+		"""
 		def on_ok(reason):
 			gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
 				'outcast', reason)
@@ -2227,37 +2280,51 @@ class GroupchatControl(ChatControlBase):
 			_('You may specify a reason below:'), ok_handler=on_ok)
 
 	def grant_membership(self, widget, jid):
-		'''grant membership privilege to a user'''
+		"""
+		Grant membership privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
 			'member')
 
 	def revoke_membership(self, widget, jid):
-		'''revoke membership privilege to a user'''
+		"""
+		Revoke membership privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
 			'none')
 
 	def grant_admin(self, widget, jid):
-		'''grant administrative privilege to a user'''
+		"""
+		Grant administrative privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
 			'admin')
 
 	def revoke_admin(self, widget, jid):
-		'''revoke administrative privilege to a user'''
+		"""
+		Revoke administrative privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
 			'member')
 
 	def grant_owner(self, widget, jid):
-		'''grant owner privilege to a user'''
+		"""
+		Grant owner privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
 			'owner')
 
 	def revoke_owner(self, widget, jid):
-		'''revoke owner privilege to a user'''
+		"""
+		Revoke owner privilege to a user
+		"""
 		gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
 			'admin')
 
 	def on_info(self, widget, nick):
-		'''Call vcard_information_window class to display user's information'''
+		"""
+		 Call vcard_information_window class to display user's information
+		"""
 		gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
 		contact = gc_contact.as_contact()
 		if contact.jid in gajim.interface.instances[self.account]['infos']:
diff --git a/src/groups.py b/src/groups.py
index 1b78f5708..2588b11a4 100644
--- a/src/groups.py
+++ b/src/groups.py
@@ -26,7 +26,10 @@ import gtkgui_helpers
 
 class GroupsPostWindow:
 	def __init__(self, account, servicejid, groupid):
-		'''Open new 'create post' window to create message for groupid on servicejid service.'''
+		"""
+		Open new 'create post' window to create message for groupid on servicejid
+		service
+		"""
 		assert isinstance(servicejid, basestring)
 		assert isinstance(groupid, basestring)
 
@@ -43,11 +46,15 @@ class GroupsPostWindow:
 		self.window.show_all()
 
 	def on_cancel_button_clicked(self, w):
-		'''Close window.'''
+		"""
+		Close window
+		"""
 		self.window.destroy()
 
 	def on_send_button_clicked(self, w):
-		'''Gather info from widgets and send it as a message.'''
+		"""
+		Gather info from widgets and send it as a message
+		"""
 		# constructing item to publish... that's atom:entry element
 		item = xmpp.Node('entry', {'xmlns':'http://www.w3.org/2005/Atom'})
 		author = item.addChild('author')
diff --git a/src/gtkexcepthook.py b/src/gtkexcepthook.py
index bbc93f373..1c08fcd24 100644
--- a/src/gtkexcepthook.py
+++ b/src/gtkexcepthook.py
@@ -52,7 +52,6 @@ def _info(type_, value, tb):
 	RESPONSE_REPORT_BUG = 42
 	dialog.add_buttons(gtk.STOCK_CLOSE, gtk.BUTTONS_CLOSE,
 		_('_Report Bug'), RESPONSE_REPORT_BUG)
-	dialog.set_default_response(RESPONSE_REPORT_BUG)
 	report_button = dialog.action_area.get_children()[0] # right to left
 	report_button.grab_focus()
 
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 6a8b1b1cf..1e01829cf 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -30,17 +30,41 @@
 import xml.sax.saxutils
 import gtk
 import gtk.glade
+import glib
 import gobject
 import pango
 import os
 import sys
 
-import vcard
-import dialogs
-
 import logging
 log = logging.getLogger('gajim.gtkgui_helpers')
 
+from common import i18n
+from common import gajim
+
+gtk_icon_theme = gtk.icon_theme_get_default()
+gtk_icon_theme.append_search_path(gajim.ICONS_DIR)
+
+def get_icon_pixmap(icon_name, size=16):
+	try:
+		return gtk_icon_theme.load_icon(icon_name, size, 0)
+	except gobject.GError, e:
+		log.error('Unable to load icon %s: %s' % (icon_name, str(e)))
+
+def get_icon_path(icon_name, size=16):
+	try:
+		icon_info = gtk_icon_theme.lookup_icon(icon_name, size, 0)
+		if icon_info == None:
+			log.error('Icon not found: %s' % icon_name)
+			return ""
+		else:
+			return icon_info.get_filename()
+	except gobject.GError, e:
+		log.error("Unable to find icon %s: %s" % (icon_name, str(e)))
+
+import vcard
+import dialogs
+
 
 HAS_PYWIN32 = True
 if os.name == 'nt':
@@ -51,8 +75,6 @@ if os.name == 'nt':
 	except ImportError:
 		HAS_PYWIN32 = False
 
-from common import i18n
-from common import gajim
 from common import helpers
 
 gtk.glade.bindtextdomain(i18n.APP, i18n.DIR)
@@ -61,14 +83,25 @@ gtk.glade.textdomain(i18n.APP)
 screen_w = gtk.gdk.screen_width()
 screen_h = gtk.gdk.screen_height()
 
+def add_image_to_menuitem(menuitem, icon_name):
+	img = gtk.Image()
+	path_img = get_icon_path(icon_name)
+	img.set_from_file(path_img)
+	menuitem.set_image(img)
+
+def add_image_to_button(button, icon_name):
+	add_image_to_menuitem(button, icon_name)
+
 GLADE_DIR = os.path.join(gajim.DATA_DIR, 'glade')
 def get_glade(file_name, root = None):
 	file_path = os.path.join(GLADE_DIR, file_name)
 	return gtk.glade.XML(file_path, root=root, domain=i18n.APP)
 
 def get_completion_liststore(entry):
-	''' create a completion model for entry widget
-	completion list consists of (Pixbuf, Text) rows'''
+	"""
+	Create a completion model for entry widget completion list consists of
+	(Pixbuf, Text) rows
+	"""
 	completion = gtk.EntryCompletion()
 	liststore = gtk.ListStore(gtk.gdk.Pixbuf, str)
 
@@ -86,7 +119,9 @@ def get_completion_liststore(entry):
 
 
 def popup_emoticons_under_button(menu, button, parent_win):
-	''' pops emoticons menu under button, which is in parent_win'''
+	"""
+	Popup the emoticons menu under button, which is in parent_win
+	"""
 	window_x1, window_y1 = parent_win.get_origin()
 	def position_menu_under_button(menu):
 		# inline function, which will not keep refs, when used as CB
@@ -115,8 +150,9 @@ def popup_emoticons_under_button(menu, button, parent_win):
 	menu.popup(None, None, position_menu_under_button, 1, 0)
 
 def get_theme_font_for_option(theme, option):
-	'''return string description of the font, stored in
-	theme preferences'''
+	"""
+	Return string description of the font, stored in theme preferences
+	"""
 	font_name = gajim.config.get_per('themes', theme, option)
 	font_desc = pango.FontDescription()
 	font_prop_str =  gajim.config.get_per('themes', theme, option + 'attrs')
@@ -130,10 +166,10 @@ def get_theme_font_for_option(theme, option):
 	return fd.to_string()
 
 def get_default_font():
-	'''Get the desktop setting for application font
-	first check for GNOME, then Xfce and last KDE
-	it returns None on failure or else a string 'Font Size' '''
-
+	"""
+	Get the desktop setting for application font first check for GNOME, then
+	Xfce and last KDE it returns None on failure or else a string 'Font Size'
+	"""
 	try:
 		import gconf
 		# in try because daemon may not be there
@@ -144,8 +180,8 @@ def get_default_font():
 	except Exception:
 		pass
 
-	# try to get xfce default font
-	# Xfce 4.2 adopts freedesktop.org's Base Directory Specification
+	# try to get Xfce default font
+	# Xfce 4.2 and higher follow freedesktop.org's Base Directory Specification
 	# see http://www.xfce.org/~benny/xfce/file-locations.html
 	# and http://freedesktop.org/Standards/basedir-spec
 	xdg_config_home = os.environ.get('XDG_CONFIG_HOME', '')
@@ -206,7 +242,9 @@ def user_runs_xfce():
 	return False
 
 def get_running_processes():
-	'''returns running processes or None (if not /proc exists)'''
+	"""
+	Return running processes or None (if /proc does not exist)
+	"""
 	if os.path.isdir('/proc'):
 		# under Linux: checking if 'gnome-session' or
 		# 'startkde' programs were run before gajim, by
@@ -241,7 +279,9 @@ def get_running_processes():
 	return []
 
 def move_window(window, x, y):
-	'''moves the window but also checks if out of screen'''
+	"""
+	Move the window, but also check if out of screen
+	"""
 	if x < 0:
 		x = 0
 	if y < 0:
@@ -254,7 +294,9 @@ def move_window(window, x, y):
 	window.move(x, y)
 
 def resize_window(window, w, h):
-	'''resizes window but also checks if huge window or negative values'''
+	"""
+	Resize window, but also checks if huge window or negative values
+	"""
 	if not w or not h:
 		return
 	if w > screen_w:
@@ -354,8 +396,10 @@ def parse_server_xml(path_to_file):
 		print >> sys.stderr, _('Error parsing file:'), message
 
 def set_unset_urgency_hint(window, unread_messages_no):
-	'''sets/unsets urgency hint in window argument
-	depending if we have unread messages or not'''
+	"""
+	Sets/unset urgency hint in window argument depending if we have unread
+	messages or not
+	"""
 	if gajim.config.get('use_urgency_hint'):
 		if unread_messages_no > 0:
 			window.props.urgency_hint = True
@@ -363,8 +407,10 @@ def set_unset_urgency_hint(window, unread_messages_no):
 			window.props.urgency_hint = False
 
 def get_abspath_for_script(scriptname, want_type = False):
-	'''checks if we are svn or normal user and returns abspath to asked script
-	if want_type is True we return 'svn' or 'install' '''
+	"""
+	Check if we are svn or normal user and return abspath to asked script if
+	want_type is True we return 'svn' or 'install'
+	"""
 	if os.path.isdir('.svn'): # we are svn user
 		type_ = 'svn'
 		cwd = os.getcwd() # it's always ending with src
@@ -403,8 +449,10 @@ def get_abspath_for_script(scriptname, want_type = False):
 		return path_to_script
 
 def get_pixbuf_from_data(file_data, want_type = False):
-	'''Gets image data and returns gtk.gdk.Pixbuf
-	if want_type is True it also returns 'jpeg', 'png' etc'''
+	"""
+	Get image data and returns gtk.gdk.Pixbuf if want_type is True it also
+	returns 'jpeg', 'png' etc
+	"""
 	pixbufloader = gtk.gdk.PixbufLoader()
 	try:
 		pixbufloader.write(file_data)
@@ -431,8 +479,11 @@ def get_invisible_cursor():
 	return cursor
 
 def get_current_desktop(window):
-	'''returns the current virtual desktop for given window
-	NOTE: window is GDK window'''
+	"""
+	Return the current virtual desktop for given window
+
+	NOTE: Window is a GDK window.
+	"""
 	prop = window.property_get('_NET_CURRENT_DESKTOP')
 	if prop is None: # it means it's normal window (not root window)
 		# so we look for it's current virtual desktop in another property
@@ -444,9 +495,12 @@ def get_current_desktop(window):
 		return current_virtual_desktop_no
 
 def possibly_move_window_in_current_desktop(window):
-	'''moves GTK window to current virtual desktop if it is not in the
-	current virtual desktop
-	window is GTK window'''
+	"""
+	Moves GTK window to current virtual desktop if it is not in the current
+	virtual desktop
+
+	NOTE: Window is a GDK window.
+	"""
 	if os.name == 'nt':
 		return False
 
@@ -468,7 +522,11 @@ def possibly_move_window_in_current_desktop(window):
 	return False
 
 def file_is_locked(path_to_file):
-	'''returns True if file is locked (WINDOWS ONLY)'''
+	"""
+	Return True if file is locked
+
+	NOTE: Windows only.
+	"""
 	if os.name != 'nt': # just in case
 		return
 
@@ -496,8 +554,10 @@ def file_is_locked(path_to_file):
 		return False
 
 def _get_fade_color(treeview, selected, focused):
-	'''get a gdk color that is between foreground and background in 0.3
-	0.7 respectively colors of the cell for the given treeview'''
+	"""
+	Get a gdk color that is between foreground and background in 0.3
+	0.7 respectively colors of the cell for the given treeview
+	"""
 	style = treeview.style
 	if selected:
 		if focused: # is the window focused?
@@ -516,9 +576,10 @@ def _get_fade_color(treeview, selected, focused):
 					int(bg.blue*p + fg.blue*q))
 
 def get_scaled_pixbuf(pixbuf, kind):
-	'''returns scaled pixbuf, keeping ratio etc or None
-	kind is either "chat", "roster", "notification", "tooltip", "vcard"'''
-
+	"""
+	Return scaled pixbuf, keeping ratio etc or None kind is either "chat",
+	"roster", "notification", "tooltip", "vcard"
+	"""
 	# resize to a width / height for the avatar not to have distortion
 	# (keep aspect ratio)
 	width = gajim.config.get(kind + '_avatar_width')
@@ -543,21 +604,28 @@ def get_scaled_pixbuf(pixbuf, kind):
 	scaled_buf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_HYPER)
 	return scaled_buf
 
-def get_avatar_pixbuf_from_cache(fjid, is_fake_jid = False, use_local = True):
-	'''checks if jid has cached avatar and if that avatar is valid image
-	(can be shown)
-	returns None if there is no image in vcard
-	returns 'ask' if cached vcard should not be used (user changed his vcard,
-	so we have new sha) or if we don't have the vcard'''
+def get_avatar_pixbuf_from_cache(fjid, use_local=True):
+	"""
+	Check if jid has cached avatar and if that avatar is valid image (can be
+	shown)
 
+	Returns None if there is no image in vcard/
+	Returns 'ask' if cached vcard should not be used (user changed his vcard, so
+	we have new sha) or if we don't have the vcard
+	"""
 	jid, nick = gajim.get_room_and_nick_from_fjid(fjid)
 	if gajim.config.get('hide_avatar_of_transport') and\
 		gajim.jid_is_transport(jid):
 		# don't show avatar for the transport itself
 		return None
+	
+	if any(jid in gajim.contacts.get_gc_list(acc) for acc in gajim.connections):
+		is_groupchat_contact = True
+	else:
+		is_groupchat_contact = False
 
 	puny_jid = helpers.sanitize_filename(jid)
-	if is_fake_jid:
+	if is_groupchat_contact:
 		puny_nick = helpers.sanitize_filename(nick)
 		path = os.path.join(gajim.VCARD_PATH, puny_jid, puny_nick)
 		local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid,
@@ -579,7 +647,7 @@ def get_avatar_pixbuf_from_cache(fjid, is_fake_jid = False, use_local = True):
 		return 'ask'
 
 	vcard_dict = gajim.connections.values()[0].get_cached_vcard(fjid,
-		is_fake_jid)
+		is_groupchat_contact)
 	if not vcard_dict: # This can happen if cached vcard is too old
 		return 'ask'
 	if 'PHOTO' not in vcard_dict:
@@ -588,16 +656,21 @@ def get_avatar_pixbuf_from_cache(fjid, is_fake_jid = False, use_local = True):
 	return pixbuf
 
 def make_gtk_month_python_month(month):
-	'''gtk start counting months from 0, so January is 0
-	but python's time start from 1, so align to python
-	month MUST be integer'''
+	"""
+	GTK starts counting months from 0, so January is 0 but Python's time start
+	from 1, so align to Python
+
+	NOTE: Month MUST be an integer.
+	"""
 	return month + 1
 
 def make_python_month_gtk_month(month):
 	return month - 1
 
 def make_color_string(color):
-	'''create #aabbcc color string from gtk color'''
+	"""
+	Create #aabbcc color string from gtk color
+	"""
 	col = '#'
 	for i in ('red', 'green', 'blue'):
 		h = hex(getattr(color, i) / (16*16)).split('x')[1]
@@ -612,10 +685,12 @@ def make_pixbuf_grayscale(pixbuf):
 	return pixbuf2
 
 def get_path_to_generic_or_avatar(generic, jid = None, suffix = None):
-	'''Chooses between avatar image and default image.
-	Returns full path to the avatar image if it exists,
-	otherwise returns full path to the image.
-	generic must be with extension and suffix without'''
+	"""
+	Choose between avatar image and default image
+
+	Returns full path to the avatar image if it exists, otherwise returns full
+	path to the image.  generic must be with extension and suffix without
+	"""
 	if jid:
 		# we want an avatar
 		puny_jid = helpers.sanitize_filename(jid)
@@ -632,9 +707,10 @@ def get_path_to_generic_or_avatar(generic, jid = None, suffix = None):
 	return os.path.abspath(generic)
 
 def decode_filechooser_file_paths(file_paths):
-	'''decode as UTF-8 under Windows and
-	ask sys.getfilesystemencoding() in POSIX
-	file_paths MUST be LIST'''
+	"""
+	Decode as UTF-8 under Windows and ask sys.getfilesystemencoding() in POSIX
+	file_paths MUST be LIST
+	"""
 	file_paths_list = list()
 
 	if os.name == 'nt': # decode as UTF-8 under Windows
@@ -655,7 +731,9 @@ def decode_filechooser_file_paths(file_paths):
 	return file_paths_list
 
 def possibly_set_gajim_as_xmpp_handler():
-	'''registers (by default only the first time) xmmp: to Gajim.'''
+	"""
+	Register (by default only the first time) 'xmmp:' to Gajim
+	"""
 	path_to_dot_kde = os.path.expanduser('~/.kde')
 	if os.path.exists(path_to_dot_kde):
 		path_to_kde_file = os.path.join(path_to_dot_kde,
@@ -737,8 +815,10 @@ Description=xmpp
 			dlg.checkbutton.set_active(True)
 
 def escape_underscore(s):
-	'''Escape underlines to prevent them from being interpreted
-	as keyboard accelerators'''
+	"""
+	Escape underlines to prevent them from being interpreted as keyboard
+	accelerators
+	"""
 	return s.replace('_', '__')
 
 def get_state_image_from_file_path_show(file_path, show):
@@ -756,7 +836,9 @@ def get_state_image_from_file_path_show(file_path, show):
 	return image
 
 def get_possible_button_event(event):
-	'''mouse or keyboard caused the event?'''
+	"""
+	Mouse or keyboard caused the event?
+	"""
 	if event.type == gtk.gdk.KEY_PRESS:
 		return 0 # no event.button so pass 0
 	# BUTTON_PRESS event, so pass event.button
@@ -765,39 +847,34 @@ def get_possible_button_event(event):
 def destroy_widget(widget):
 	widget.destroy()
 
-def on_avatar_save_as_menuitem_activate(widget, jid, account,
-default_name = ''):
+def on_avatar_save_as_menuitem_activate(widget, jid, account, default_name=''):
 	def on_continue(response, file_path):
 		if response < 0:
 			return
-		# Get pixbuf
-		pixbuf = None
-		is_fake = False
-		if account and gajim.contacts.is_pm_from_jid(account, jid):
-			is_fake = True
-		pixbuf = get_avatar_pixbuf_from_cache(jid, is_fake, False)
-		ext = file_path.split('.')[-1]
-		type_ = ''
-		if not ext:
+		pixbuf = get_avatar_pixbuf_from_cache(jid)
+		path, extension = os.path.splitext(file_path)
+		if not extension:
 			# Silently save as Jpeg image
+			image_format = 'jpeg'
 			file_path += '.jpeg'
-			type_ = 'jpeg'
-		elif ext == 'jpg':
-			type_ = 'jpeg'
+		elif extension == 'jpg':
+			image_format = 'jpeg'
 		else:
-			type_ = ext
+			image_format = extension[1:] # remove leading dot
 
 		# Save image
 		try:
-			pixbuf.save(file_path, type_)
-		except Exception:
+			pixbuf.save(file_path, image_format)
+		except glib.GError, e:
+			log.debug('Error saving avatar: %s' % str(e))
 			if os.path.exists(file_path):
 				os.remove(file_path)
 			new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg'
 			def on_ok(file_path, pixbuf):
 				pixbuf.save(file_path, 'jpeg')
 			dialogs.ConfirmationDialog(_('Extension not supported'),
-				_('Image cannot be saved in %(type)s format. Save as %(new_filename)s?') % {'type': type_, 'new_filename': new_file_path},
+				_('Image cannot be saved in %(type)s format. Save as %(new_filename)s?'
+				) % {'type': image_format, 'new_filename': new_file_path},
 				on_response_ok = (on_ok, new_file_path, pixbuf))
 		else:
 			dialog.destroy()
@@ -839,7 +916,7 @@ default_name = ''):
 		current_folder=gajim.config.get('last_save_dir'), on_response_ok=on_ok,
 		on_response_cancel=on_cancel)
 
-	dialog.set_current_name(default_name)
+	dialog.set_current_name(default_name + '.jpeg')
 	dialog.connect('delete-event', lambda widget, event:
 		on_cancel(widget))
 
@@ -847,7 +924,9 @@ def on_bm_header_changed_state(widget, event):
 	widget.set_state(gtk.STATE_NORMAL) #do not allow selected_state
 
 def create_combobox(value_list, selected_value = None):
-	'''Value_list is [(label1, value1), ]'''
+	"""
+	Value_list is [(label1, value1)]
+	"""
 	liststore = gtk.ListStore(str, str)
 	combobox = gtk.ComboBox(liststore)
 	cell = gtk.CellRendererText()
@@ -864,7 +943,9 @@ def create_combobox(value_list, selected_value = None):
 	return combobox
 
 def create_list_multi(value_list, selected_values=None):
-	'''Value_list is [(label1, value1), ]'''
+	"""
+	Value_list is [(label1, value1)]
+	"""
 	liststore = gtk.ListStore(str, str)
 	treeview = gtk.TreeView(liststore)
 	treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
@@ -882,8 +963,10 @@ def create_list_multi(value_list, selected_values=None):
 	return treeview
 
 def load_iconset(path, pixbuf2=None, transport=False):
-	'''load full iconset from the given path, and add
-	pixbuf2 on top left of each static images'''
+	"""
+	Load full iconset from the given path, and add pixbuf2 on top left of each
+	static images
+	"""
 	path += '/'
 	if transport:
 		list_ = ('online', 'chat', 'away', 'xa', 'dnd', 'offline',
@@ -898,21 +981,27 @@ def load_iconset(path, pixbuf2=None, transport=False):
 	return _load_icon_list(list_, path, pixbuf2)
 
 def load_icon(icon_name):
-	'''load an icon from the iconset in 16x16'''
+	"""
+	Load an icon from the iconset in 16x16
+	"""
 	iconset = gajim.config.get('iconset')
 	path = os.path.join(helpers.get_iconset_path(iconset), '16x16', '')
 	icon_list = _load_icon_list([icon_name], path)
 	return icon_list[icon_name]
 
 def load_mood_icon(icon_name):
-	'''load an icon from the mood iconset in 16x16'''
+	"""
+	Load an icon from the mood iconset in 16x16
+	"""
 	iconset = gajim.config.get('mood_iconset')
 	path = os.path.join(helpers.get_mood_iconset_path(iconset), '')
 	icon_list = _load_icon_list([icon_name], path)
 	return icon_list[icon_name]
 
 def load_activity_icon(category, activity = None):
-	'''load an icon from the activity iconset in 16x16'''
+	"""
+	Load an icon from the activity iconset in 16x16
+	"""
 	iconset = gajim.config.get('activity_iconset')
 	path = os.path.join(helpers.get_activity_iconset_path(iconset),
 		category, '')
@@ -922,8 +1011,10 @@ def load_activity_icon(category, activity = None):
 	return icon_list[activity]
 
 def load_icons_meta():
-	'''load and return  - AND + small icons to put on top left of an icon
-	for meta contacts.'''
+	"""
+	Load and return  - AND + small icons to put on top left of an icon for meta
+	contacts
+	"""
 	iconset = gajim.config.get('iconset')
 	path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
 	# try to find opened_meta.png file, else opened.png else nopixbuf merge
@@ -945,8 +1036,10 @@ def load_icons_meta():
 	return pixo, pixc
 
 def _load_icon_list(icons_list, path, pixbuf2 = None):
-	'''load icons in icons_list from the given path,
-	and add pixbuf2 on top left of each static images'''
+	"""
+	Load icons in icons_list from the given path, and add pixbuf2 on top left of
+	each static images
+	"""
 	imgs = {}
 	for icon in icons_list:
 		# try to open a pixfile with the correct method
@@ -972,7 +1065,9 @@ def _load_icon_list(icons_list, path, pixbuf2 = None):
 	return imgs
 
 def make_jabber_state_images():
-	'''initialise jabber_state_images dict'''
+	"""
+	Initialize jabber_state_images dictionary
+	"""
 	iconset = gajim.config.get('iconset')
 	if iconset:
 		if helpers.get_iconset_path(iconset):
@@ -1002,8 +1097,10 @@ def reload_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.'''
+	"""
+	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)):
@@ -1013,7 +1110,9 @@ def label_set_autowrap(widget):
 		widget.connect_after('size-allocate', __label_size_allocate)
 
 def __label_size_allocate(widget, allocation):
-	'''Callback which re-allocates the size of a label.'''
+	"""
+	Callback which re-allocates the size of a label
+	"""
 	layout = widget.get_layout()
 
 	lw_old, lh_old = layout.get_size()
diff --git a/src/gui_interface.py b/src/gui_interface.py
index 8e1243264..095346554 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -50,11 +50,11 @@ from common import gajim
 from common import dbus_support
 if dbus_support.supported:
 	from music_track_listener import MusicTrackListener
+	from common import location_listener
 	import dbus
 
 import gtkgui_helpers
 
-
 import dialogs
 import notify
 import message_control
@@ -72,7 +72,7 @@ import common.sleepy
 from common.xmpp import idlequeue
 from common.zeroconf import connection_zeroconf
 from common import resolver
-from common import caps
+from common import caps_cache
 from common import proxy65_manager
 from common import socks5
 from common import helpers
@@ -93,7 +93,6 @@ config_filename = gajimpaths['CONFIG_FILE']
 from common import optparser
 parser = optparser.OptionsParser(config_filename)
 
-
 import logging
 log = logging.getLogger('gajim.interface')
 
@@ -202,9 +201,7 @@ class Interface:
 
 	def handle_event_connection_lost(self, account, array):
 		# ('CONNECTION_LOST', account, [title, text])
-		path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-			'connection_lost.png')
-		path = gtkgui_helpers.get_path_to_generic_or_avatar(path)
+		path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48)
 		notify.popup(_('Connection Failed'), account, account,
 			'connection_failed', path, array[0], array[1])
 
@@ -266,10 +263,10 @@ class Interface:
 
 	def handle_event_new_jid(self, account, data):
 		#('NEW_JID', account, (old_jid, new_jid))
-		'''
+		"""
 		This event is raised when our JID changed (most probably because we use
-		anonymous account. We update contact and roster entry in this case.
-		'''
+		anonymous account. We update contact and roster entry in this case
+		"""
 		self.roster.rename_self_contact(data[0], data[1], account)
 
 	def edit_own_details(self, account):
@@ -444,7 +441,7 @@ class Interface:
 
 				# TODO: This causes problems when another
 				#	resource signs off!
-				conn.remove_transfers_for_contact(contact1)
+				conn.stop_all_active_file_transfers(contact1)
 
 				# disable encryption, since if any messages are
 				# lost they'll be not decryptable (note that
@@ -596,9 +593,7 @@ class Interface:
 		self.add_event(account, jid, 'subscription_request', (text, nick))
 
 		if helpers.allow_showing_notification(account):
-			path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-				'subscription_request.png')
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(path)
+			path = gtkgui_helpers.get_icon_path('gajim-subscription_request', 48)
 			event_type = _('Subscription request')
 			notify.popup(event_type, jid, account, 'subscription_request', path,
 				event_type, jid)
@@ -656,13 +651,12 @@ class Interface:
 
 		if helpers.allow_popup_window(account) or not self.systray_enabled:
 			self.show_unsubscribed_dialog(account, contact)
+			return
 
 		self.add_event(account, jid, 'unsubscribed', contact)
 
 		if helpers.allow_showing_notification(account):
-			path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-				'unsubscribed.png')
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(path)
+			path = gtkgui_helpers.get_icon_path('gajim-unsubscribed', 48)
 			event_type = _('Unsubscribed')
 			notify.popup(event_type, jid, account, 'unsubscribed', path,
 				event_type, jid)
@@ -824,12 +818,18 @@ class Interface:
 			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
+			last_time = time.localtime(time.time() - tim)
+			if c.show == 'offline':
+				c.last_status_time = last_time
+			else:
+				c.last_activity_time = last_time
 		if win:
 			win.set_last_status_time()
+		if self.roster.tooltip.id and self.roster.tooltip.win:
+			self.roster.tooltip.update_last_time(last_time)
 		if self.remote_ctrl:
 			self.remote_ctrl.raise_signal('LastStatusTime', (account, array))
 
@@ -1120,9 +1120,7 @@ class Interface:
 			array[3], array[4]))
 
 		if helpers.allow_showing_notification(account):
-			path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-				'gc_invitation.png')
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(path)
+			path = gtkgui_helpers.get_icon_path('gajim-gc_invitation', 48)
 			event_type = _('Groupchat Invitation')
 			notify.popup(event_type, jid, account, 'gc-invitation', path,
 				event_type, room_jid)
@@ -1142,7 +1140,7 @@ class Interface:
 			sectext += _('You are currently connected without your OpenPGP key.')
 			dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext)
 		else:
-			path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'warning.png')
+			path = gtkgui_helpers.get_icon_path('gajim-warning', 48)
 			notify.popup('warning', account, account, 'warning', path,
 				_('OpenGPG Passphrase Incorrect'),
 				_('You are currently connected without your OpenPGP key.'))
@@ -1279,8 +1277,7 @@ class Interface:
 		self.add_event(account, jid, 'file-send-error', file_props)
 
 		if helpers.allow_showing_notification(account):
-			img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', 'ft_error.png')
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(img)
+			path = gtkgui_helpers.get_icon_path('gajim-ft_error', 48)
 			event_type = _('File Transfer Error')
 			notify.popup(event_type, jid, account, 'file-send-error', path,
 				event_type, file_props['name'])
@@ -1290,8 +1287,7 @@ class Interface:
 		gmail_new_messages = int(array[1])
 		gmail_messages_list = array[2]
 		if gajim.config.get('notify_on_new_gmail_email'):
-			img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-				'new_email_recv.png')
+			path = gtkgui_helpers.get_icon_path('gajim-new_email_recv', 48)
 			title = _('New mail on %(gmail_mail_address)s') % \
 				{'gmail_mail_address': jid}
 			text = i18n.ngettext('You have %d new mail conversation',
@@ -1314,7 +1310,6 @@ class Interface:
 
 			if gajim.config.get_per('soundevents', 'gmail_received', 'enabled'):
 				helpers.play_sound('gmail_received')
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(img)
 			notify.popup(_('New E-mail'), jid, account, 'gmail',
 				path_to_image=path, title=title,
 				text=text)
@@ -1325,6 +1320,7 @@ class Interface:
 	def handle_event_file_request_error(self, account, array):
 		# ('FILE_REQUEST_ERROR', account, (jid, file_props, error_msg))
 		jid, file_props, errmsg = array
+		jid = gajim.get_jid_without_resource(jid)
 		ft = self.instances['file_transfers']
 		ft.set_status(file_props['type'], file_props['sid'], 'stop')
 		errno = file_props['error']
@@ -1345,15 +1341,14 @@ class Interface:
 
 		if helpers.allow_showing_notification(account):
 			# check if we should be notified
-			img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', 'ft_error.png')
-
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(img)
+			path = gtkgui_helpers.get_icon_path('gajim-ft_error', 48)
 			event_type = _('File Transfer Error')
 			notify.popup(event_type, jid, account, msg_type, path,
 				title = event_type, text = file_props['name'])
 
 	def handle_event_file_request(self, account, array):
 		jid = array[0]
+		jid = gajim.get_jid_without_resource(jid)
 		if jid not in gajim.contacts.get_jid_list(account):
 			keyID = ''
 			attached_keys = gajim.config.get_per('accounts', account,
@@ -1375,11 +1370,9 @@ class Interface:
 		self.add_event(account, jid, 'file-request', file_props)
 
 		if helpers.allow_showing_notification(account):
-			img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-				'ft_request.png')
+			path = gtkgui_helpers.get_icon_path('gajim-ft_request', 48)
 			txt = _('%s wants to send you a file.') % gajim.get_name_from_jid(
 				account, jid)
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(img)
 			event_type = _('File Transfer Request')
 			notify.popup(event_type, jid, account, 'file-request',
 				path_to_image = path, title = event_type, text = txt)
@@ -1450,11 +1443,11 @@ class Interface:
 				if event_type == _('File Transfer Completed'):
 					txt = _('You successfully received %(filename)s from %(name)s.')\
 						% {'filename': filename, 'name': name}
-					img = 'ft_done.png'
+					img_name = 'gajim-ft_done'
 				else: # ft stopped
 					txt = _('File transfer of %(filename)s from %(name)s stopped.')\
 						% {'filename': filename, 'name': name}
-					img = 'ft_stopped.png'
+					img_name = 'gajim-ft_stopped'
 			else:
 				receiver = file_props['receiver']
 				if hasattr(receiver, 'jid'):
@@ -1467,23 +1460,23 @@ class Interface:
 				if event_type == _('File Transfer Completed'):
 					txt = _('You successfully sent %(filename)s to %(name)s.')\
 						% {'filename': filename, 'name': name}
-					img = 'ft_done.png'
+					img_name = 'gajim-ft_done'
 				else: # ft stopped
 					txt = _('File transfer of %(filename)s to %(name)s stopped.')\
 						% {'filename': filename, 'name': name}
-					img = 'ft_stopped.png'
-			img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', img)
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(img)
+					img_name = 'gajim-ft_stopped'
+			path = gtkgui_helpers.get_icon_path(img_name, 48)
 		else:
 			txt = ''
+			path = ''
 
 		if gajim.config.get('notify_on_file_complete') and \
 			(gajim.config.get('autopopupaway') or \
 			gajim.connections[account].connected in (2, 3)):
 			# we want to be notified and we are online/chat or we don't mind
 			# bugged when away/na/busy
-			notify.popup(event_type, jid, account, msg_type, path_to_image = path,
-				title = event_type, text = txt)
+			notify.popup(event_type, jid, account, msg_type, path_to_image=path,
+				title=event_type, text=txt)
 
 	def handle_event_stanza_arrived(self, account, stanza):
 		if account not in self.instances:
@@ -1520,7 +1513,9 @@ class Interface:
 				contact.resource)
 
 	def handle_event_signed_in(self, account, empty):
-		'''SIGNED_IN event is emitted when we sign in, so handle it'''
+		"""
+		SIGNED_IN event is emitted when we sign in, so handle it
+		"""
 		# ('SIGNED_IN', account, ())
 		# block signed in notifications for 30 seconds
 		gajim.block_signed_in_notifications[account] = True
@@ -1560,6 +1555,10 @@ class Interface:
 		if gajim.connections[account].pep_supported and dbus_support.supported \
 		and gajim.config.get_per('accounts', account, 'publish_tune'):
 			self.enable_music_listener()
+		# enable location listener
+		if gajim.connections[account].pep_supported and dbus_support.supported \
+		and gajim.config.get_per('accounts', account, 'publish_location'):
+			location_listener.enable()
 
 	def handle_event_metacontacts(self, account, tags_list):
 		gajim.contacts.define_metacontacts(account, tags_list)
@@ -1765,11 +1764,9 @@ class Interface:
 
 		if helpers.allow_showing_notification(account):
 			# TODO: we should use another pixmap ;-)
-			img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-				'ft_request.png')
 			txt = _('%s wants to start a voice chat.') % gajim.get_name_from_jid(
 				account, peerjid)
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(img)
+			path = gtkgui_helpers.get_icon_path('gajim-mic_active', 48)
 			event_type = _('Voice Chat Request')
 			notify.popup(event_type, peerjid, account, 'jingle-incoming',
 				path_to_image = path, title = event_type, text = txt)
@@ -1827,7 +1824,9 @@ class Interface:
 		dialogs.RosterItemExchangeWindow(account, data[0], data[1], data[2])
 
 	def handle_event_unique_room_id_supported(self, account, data):
-		'''Receive confirmation that unique_room_id are supported'''
+		"""
+		Receive confirmation that unique_room_id are supported
+		"""
 		# ('UNIQUE_ROOM_ID_SUPPORTED', server, instance, room_id)
 		instance = data[1]
 		instance.unique_room_id_supported(data[0], data[2])
@@ -1946,10 +1945,10 @@ class Interface:
 		# ('INSECURE_SSL_CONNECTION', account, (connection, connection_type))
 		server = gajim.config.get_per('accounts', account, 'hostname')
 		def on_ok(is_checked):
-			del self.instances[account]['online_dialog']['insecure_ssl']
 			if not is_checked[0]:
 				on_cancel()
 				return
+			del self.instances[account]['online_dialog']['insecure_ssl']
 			if is_checked[1]:
 				gajim.config.set_per('accounts', account,
 					'warn_when_insecure_ssl_connection', False)
@@ -1990,6 +1989,34 @@ class Interface:
 				_('PEP node %(node)s was not removed: %(message)s') % {
 				'node': data[1], 'message': data[2]})
 
+	def handle_event_pep_received(self, account, data):
+		# ('PEP_RECEIVED', account, (jid, pep_type))
+		jid = data[0]
+		pep_type = data[1]
+		ctrl = common.gajim.interface.msg_win_mgr.get_control(jid, account)
+
+		if jid == common.gajim.get_jid_from_account(account):
+			self.roster.draw_account(account)
+
+		if pep_type == 'nickname':
+			self.roster.draw_contact(jid, account)
+			if ctrl:
+				ctrl.update_ui()
+				win = ctrl.parent_win
+				win.redraw_tab(ctrl)
+				win.show_title()
+		else:
+			self.roster.draw_pep(jid, account, pep_type)
+			if ctrl:
+				ctrl.update_pep(pep_type)
+
+	def handle_event_caps_received(self, account, data):
+		# ('CAPS_RECEIVED', account, (full_jid))
+		full_jid = data[0]
+		pm_ctrl = gajim.interface.msg_win_mgr.get_control(full_jid, account)
+		if pm_ctrl and hasattr(pm_ctrl, "update_contact"):
+			pm_ctrl.update_contact()
+
 	def create_core_handlers_list(self):
 		self.handlers = {
 			'ROSTER': [self.handle_event_roster],
@@ -2079,14 +2106,30 @@ class Interface:
 			'JINGLE_CONNECTED': [self.handle_event_jingle_connected],
 			'JINGLE_DISCONNECTED': [self.handle_event_jingle_disconnected],
 			'JINGLE_ERROR': [self.handle_event_jingle_error],
+			'PEP_RECEIVED': [self.handle_event_pep_received],
+			'CAPS_RECEIVED': [self.handle_event_caps_received]
 		}
 
+	def dispatch(self, event, account, data):
+		"""
+		Dispatch an network event to the event handlers of this class. Return
+		true if it could be dispatched to alteast one handler
+		"""
+		if event not in self.handlers:
+			log.warning('Unknown event %s dispatched to GUI: %s' % (event, data))
+			return False
+		else:
+			log.debug('Event %s distpached to GUI: %s' % (event, data))
+			for handler in self.handlers[event]:
+				handler(account, data)
+			return len(self.handlers[event])
+
 	def register_core_handlers(self):
-		'''
+		"""
 		Register core handlers in Global Events Dispatcher (GED).
 		
 		This is part of rewriting whole events handling system to use GED.
-		'''
+		"""
 		for event_name, event_handlers in self.handlers.iteritems():
 			for event_handler in event_handlers:
 				gajim.ged.register_event_handler(event_name,
@@ -2098,7 +2141,9 @@ class Interface:
 ################################################################################
 
 	def add_event(self, account, jid, type_, event_args):
-		'''add an event to the gajim.events var'''
+		"""
+		Add an event to the gajim.events var
+		"""
 		# We add it to the gajim.events queue
 		# Do we have a queue?
 		jid = gajim.get_jid_without_resource(jid)
@@ -2228,7 +2273,8 @@ class Interface:
 
 			w = ctrl.parent_win
 		elif type_ in ('normal', 'file-request', 'file-request-error',
-		'file-send-error', 'file-error', 'file-stopped', 'file-completed'):
+		'file-send-error', 'file-error', 'file-stopped', 'file-completed',
+		'jingle-incoming'):
 			# Get the first single message event
 			event = gajim.events.get_first_event(account, fjid, type_)
 			if not event:
@@ -2264,11 +2310,6 @@ class Interface:
 			self.show_unsubscribed_dialog(account, contact)
 			gajim.events.remove_events(account, jid, event)
 			self.roster.draw_contact(jid, account)
-		elif type_ == 'jingle-incoming':
-			event = gajim.events.get_first_event(account, jid, type_)
-			peerjid, sid, content_types = event.parameters
-			dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types)
-			gajim.events.remove_events(account, jid, event)
 		if w:
 			w.set_active_tab(ctrl)
 			w.window.window.focus(gtk.get_current_event_time())
@@ -2427,7 +2468,9 @@ class Interface:
 		self.invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|[\ud800-\udfff]|[\ufffe-\uffff]'
 
 	def popup_emoticons_under_button(self, button, parent_win):
-		''' pops emoticons menu under button, located in parent_win'''
+		"""
+		Popup the emoticons menu under button, located in parent_win
+		"""
 		gtkgui_helpers.popup_emoticons_under_button(self.emoticons_menu,
 			button, parent_win)
 
@@ -2535,8 +2578,10 @@ class Interface:
 ################################################################################
 
 	def join_gc_room(self, account, room_jid, nick, password, minimize=False,
-	is_continued=False):
-		'''joins the room immediately'''
+			is_continued=False):
+		"""
+		Join the room immediately
+		"""
 		if not nick:
 			nick = gajim.nicks[account]
 
@@ -2596,40 +2641,36 @@ class Interface:
 		mw.new_tab(gc_control)
 
 	def new_private_chat(self, gc_contact, account, session=None):
-		contact = gc_contact.as_contact()
-		type_ = message_control.TYPE_PM
-		fjid = gc_contact.room_jid + '/' + gc_contact.name
-
 		conn = gajim.connections[account]
-
-		if not session and fjid in conn.sessions:
-			sessions = [s for s in conn.sessions[fjid].values() if isinstance(s, ChatControlSession)]
+		if not session and gc_contact.get_full_jid() in conn.sessions:
+			sessions = [s for s in conn.sessions[gc_contact.get_full_jid()].values()
+				if isinstance(s, ChatControlSession)]
 
 			# look for an existing session with a chat control
 			for s in sessions:
 				if s.control:
 					session = s
 					break
-
 			if not session and not len(sessions) == 0:
 				# there are no sessions with chat controls, just take the first one
 				session = sessions[0]
-
 		if not session:
 			# couldn't find an existing ChatControlSession, just make a new one
+			session = conn.make_new_session(gc_contact.get_full_jid(), None, 'pm')
 
-			session = conn.make_new_session(fjid, None, 'pm')
-
+		contact = gc_contact.as_contact()
 		if not session.control:
-			mw = self.msg_win_mgr.get_window(fjid, account)
-			if not mw:
-				mw = self.msg_win_mgr.create_window(contact, account, type_)
+			message_window = self.msg_win_mgr.get_window(gc_contact.get_full_jid(),
+				account)
+			if not message_window:
+				message_window = self.msg_win_mgr.create_window(contact, account,
+					message_control.TYPE_PM)
 
-			session.control = PrivateChatControl(mw, gc_contact, contact, account,
-				session)
-			mw.new_tab(session.control)
+			session.control = PrivateChatControl(message_window, gc_contact,
+				contact, account, session)
+			message_window.new_tab(session.control)
 
-		if len(gajim.events.get_events(account, fjid)):
+		if gajim.events.get_events(account, gc_contact.get_full_jid()):
 			# We call this here to avoid race conditions with widget validation
 			session.control.read_queue()
 
@@ -2738,8 +2779,8 @@ class Interface:
 		if status in ('chat', 'away', 'xa', 'dnd', 'invisible', 'offline'):
 			status = status + '.png'
 		elif status == 'online':
-			prefix = os.path.join(gajim.DATA_DIR, 'pixmaps')
-			status = 'gajim.png'
+			prefix = ''
+			status = gtkgui_helpers.get_icon_path('gajim', 32)
 		path = os.path.join(prefix, status)
 		try:
 			obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn')
@@ -2761,33 +2802,27 @@ class Interface:
 		listener.disconnect(self.music_track_changed_signal)
 		self.music_track_changed_signal = None
 
-	def music_track_changed(self, unused_listener, music_track_info, account=''):
-		if account == '':
+	def music_track_changed(self, unused_listener, music_track_info, account=None):
+		if not account:
 			accounts = gajim.connections.keys()
 		else:
 			accounts = [account]
-		if music_track_info is None:
-			artist = ''
-			title = ''
-			source = ''
-		elif hasattr(music_track_info, 'paused') and music_track_info.paused == 0:
-			artist = ''
-			title = ''
-			source = ''
+			
+		is_paused = hasattr(music_track_info, 'paused') and music_track_info.paused == 0
+		if not music_track_info or is_paused:
+			artist = title = source = ''
 		else:
 			artist = music_track_info.artist
 			title = music_track_info.title
 			source = music_track_info.album
 		for acct in accounts:
-			if acct not in gajim.connections:
-				continue
 			if not gajim.account_is_connected(acct):
 				continue
-			if not gajim.connections[acct].pep_supported:
+			if not gajim.config.get_per('accounts', acct, 'publish_tune'):
 				continue
 			if gajim.connections[acct].music_track_info == music_track_info:
 				continue
-			pep.user_send_tune(acct, artist, title, source)
+			gajim.connections[acct].send_tune(artist, title, source)
 			gajim.connections[acct].music_track_info = music_track_info
 
 	def get_bg_fg_colors(self):
@@ -2810,7 +2845,9 @@ class Interface:
 		return (bg_str, fg_str)
 
 	def read_sleepy(self):
-		'''Check idle status and change that status if needed'''
+		"""
+		Check idle status and change that status if needed
+		"""
 		if not self.sleeper.poll():
 			# idle detection is not supported in that OS
 			return False # stop looping in vain
@@ -2864,7 +2901,9 @@ class Interface:
 		return True # renew timeout (loop for ever)
 
 	def autoconnect(self):
-		'''auto connect at startup'''
+		"""
+		Auto connect at startup
+		"""
 		# dict of account that want to connect sorted by status
 		shows = {}
 		for a in gajim.connections:
@@ -2903,7 +2942,9 @@ class Interface:
 		helpers.launch_browser_mailer(kind, url)
 
 	def process_connections(self):
-		''' Called each foo (200) miliseconds. Check for idlequeue timeouts.	'''
+		"""
+		Called each foo (200) miliseconds. Check for idlequeue timeouts
+		"""
 		try:
 			gajim.idlequeue.process()
 		except Exception:
@@ -2927,7 +2968,11 @@ class Interface:
 			sys.exit()
 
 	def save_avatar_files(self, jid, photo, puny_nick = None, local = False):
-		'''Saves an avatar to a separate file, and generate files for dbus notifications. An avatar can be given as a pixmap directly or as an decoded image.'''
+		"""
+		Save an avatar to a separate file, and generate files for dbus
+		notifications. An avatar can be given as a pixmap directly or as an
+		decoded image
+		"""
 		puny_jid = helpers.sanitize_filename(jid)
 		path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid)
 		if puny_nick:
@@ -2980,7 +3025,9 @@ class Interface:
 						(path_to_original_file, str(e)))
 
 	def remove_avatar_files(self, jid, puny_nick = None, local = False):
-		'''remove avatar files of a jid'''
+		"""
+		Remove avatar files of a jid
+		"""
 		puny_jid = helpers.sanitize_filename(jid)
 		path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid)
 		if puny_nick:
@@ -2997,7 +3044,9 @@ class Interface:
 				os.remove(path_to_file + '_notif_size_bw' + ext)
 
 	def auto_join_bookmarks(self, account):
-		'''autojoin bookmarked GCs that have 'auto join' on for this account'''
+		"""
+		Autojoin bookmarked GCs that have 'auto join' on for this account
+		"""
 		for bm in gajim.connections[account].bookmarks:
 			if bm['autojoin'] in ('1', 'true'):
 				jid = bm['jid']
@@ -3015,8 +3064,10 @@ class Interface:
 					self.roster.add_groupchat(jid, account)
 
 	def add_gc_bookmark(self, account, name, jid, autojoin, minimize, password,
-		nick):
-		'''add a bookmark for this account, sorted in bookmark list'''
+			nick):
+		"""
+		Add a bookmark for this account, sorted in bookmark list
+		"""
 		bm = {
 			'name': name,
 			'jid': jid,
@@ -3093,7 +3144,7 @@ class Interface:
 		gajim.ipython_window = window
 
 	def run(self):
-		if self.systray_capabilities and gajim.config.get('trayicon') != 'never':
+		if gajim.config.get('trayicon') != 'never':
 			self.show_systray()
 
 		self.roster = roster_window.RosterWindow()
@@ -3159,6 +3210,11 @@ class Interface:
 		}
 
 		cfg_was_read = parser.read()
+
+		from common import latex
+		gajim.HAVE_LATEX = gajim.config.get('use_latex') and \
+			latex.check_for_latex_support()
+
 		gajim.logger.reset_shown_unread_messages()
 		# override logging settings from config (don't take care of '-q' option)
 		if gajim.config.get('verbose'):
@@ -3277,7 +3333,7 @@ class Interface:
 		helpers.update_optional_features()
 		# prepopulate data which we are sure of; note: we do not log these info
 		for account in gajim.connections:
-			gajimcaps = caps.capscache[('sha-1', gajim.caps_hash[account])]
+			gajimcaps = caps_cache.capscache[('sha-1', gajim.caps_hash[account])]
 			gajimcaps.identities = [gajim.gajim_identity]
 			gajimcaps.features = gajim.gajim_common_features + \
 				gajim.gajim_optional_features[account]
@@ -3341,24 +3397,11 @@ class Interface:
 		gtkgui_helpers.make_jabber_state_images()
 
 		self.systray_enabled = False
-		self.systray_capabilities = False
-
-		if (os.name == 'nt'):
-			import statusicon
-			self.systray = statusicon.StatusIcon()
-			self.systray_capabilities = True
-		else: # use ours, not GTK+ one
-			# [FIXME: remove this when we migrate to 2.10 and we can do
-			# cool tooltips somehow and (not dying to keep) animation]
-			import systray
-			self.systray_capabilities = systray.HAS_SYSTRAY_CAPABILITIES
-			if self.systray_capabilities:
-				self.systray = systray.Systray()
-			else:
-				gajim.config.set('trayicon', 'never')
 
-		path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png')
-		pix = gtk.gdk.pixbuf_new_from_file(path_to_file)
+		import statusicon
+		self.systray = statusicon.StatusIcon()
+
+		pix = gtkgui_helpers.get_icon_pixmap('gajim', 32)
 		# set the icon to all windows
 		gtk.window_set_default_icon(pix)
 
@@ -3469,16 +3512,14 @@ class PassphraseRequest:
 
 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
-		'''
+		"""
+		Call a function in a thread
+		"""
 		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()
+
+# vim: se ts=3:
diff --git a/src/gui_menu_builder.py b/src/gui_menu_builder.py
index 0c975d5b6..5fd799a99 100644
--- a/src/gui_menu_builder.py
+++ b/src/gui_menu_builder.py
@@ -28,9 +28,11 @@ from common import helpers
 from common.xmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC, NS_ESESSION
 
 def build_resources_submenu(contacts, account, action, room_jid=None,
-room_account=None, cap=None):
-	''' Build a submenu with contact's resources.
-	room_jid and room_account are for action self.on_invite_to_room '''
+		room_account=None, cap=None):
+	"""
+	Build a submenu with contact's resources. room_jid and room_account are for
+	action self.on_invite_to_room
+	"""
 	roster = gajim.interface.roster
 	sub_menu = gtk.Menu()
 
@@ -61,7 +63,9 @@ room_account=None, cap=None):
 	return sub_menu
 
 def build_invite_submenu(invite_menuitem, list_):
-	'''list_ in a list of (contact, account)'''
+	"""
+	list_ in a list of (contact, account)
+	"""
 	roster = gajim.interface.roster
 	# used if we invite only one contact with several resources
 	contact_list = []
@@ -145,10 +149,12 @@ def build_invite_submenu(invite_menuitem, list_):
 			invite_to_submenu.append(menuitem)
 
 def get_contact_menu(contact, account, use_multiple_contacts=True,
-show_start_chat=True, show_encryption=False, show_buttonbar_items=True,
-control=None):
-	''' Build contact popup menu for roster and chat window.
-	If control is not set, we hide invite_contacts_menuitem'''
+		show_start_chat=True, show_encryption=False, show_buttonbar_items=True,
+		control=None):
+	"""
+	Build contact popup menu for roster and chat window. If control is not set,
+	we hide invite_contacts_menuitem
+	"""
 	if not contact:
 		return
 
@@ -194,18 +200,14 @@ control=None):
 	items_to_hide = []
 
 	# add a special img for send file menuitem
-	path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png')
+	path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload')
 	img = gtk.Image()
 	img.set_from_file(path_to_upload_img)
 	send_file_menuitem.set_image(img)
 
 	if not our_jid:
 		# add a special img for rename menuitem
-		path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-			'kbd_input.png')
-		img = gtk.Image()
-		img.set_from_file(path_to_kbd_input_img)
-		rename_menuitem.set_image(img)
+		gtkgui_helpers.add_image_to_menuitem(rename_menuitem, 'gajim-kbd_input')
 
 	muc_icon = gtkgui_helpers.load_icon('muc_active')
 	if muc_icon:
@@ -320,7 +322,7 @@ control=None):
 		for item in (send_custom_status_menuitem, send_single_message_menuitem,
 		invite_menuitem, block_menuitem, unblock_menuitem, ignore_menuitem,
 		unignore_menuitem, set_custom_avatar_menuitem, subscription_menuitem,
-		manage_contact_menuitem, convert_to_gc_menuitems):
+		manage_contact_menuitem, convert_to_gc_menuitem):
 			item.set_no_show_all(True)
 			item.hide()
 
diff --git a/src/history_manager.py b/src/history_manager.py
index 9ab638364..82c8e1475 100644
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -57,23 +57,23 @@ import getopt
 from common import i18n
 
 def parseOpts():
-   config_path = None
-
-   try:
-      shortargs = 'hc:'
-      longargs = 'help config_path='
-      opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0]
-   except getopt.error, msg:
-      print str(msg)
-      print 'for help use --help'
-      sys.exit(2)
-   for o, a in opts:
-      if o in ('-h', '--help'):
-         print 'history_manager [--help] [--config-path]'
-         sys.exit()
-      elif o in ('-c', '--config-path'):
-         config_path = a
-   return config_path
+	config_path = None
+
+	try:
+		shortargs = 'hc:'
+		longargs = 'help config_path='
+		opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0]
+	except getopt.error, msg:
+		print str(msg)
+		print 'for help use --help'
+		sys.exit(2)
+	for o, a in opts:
+		if o in ('-h', '--help'):
+			print 'history_manager [--help] [--config-path]'
+			sys.exit()
+		elif o in ('-c', '--config-path'):
+			config_path = a
+	return config_path
 
 config_path = parseOpts()
 del parseOpts
@@ -102,19 +102,12 @@ C_NICKNAME
 ) = range(2, 6)
 
 
-try:
-	import sqlite3 as sqlite # python 2.5
-except ImportError:
-	try:
-		from pysqlite2 import dbapi2 as sqlite
-	except ImportError:
-		raise exceptions.PysqliteNotAvailable
+import sqlite3 as sqlite
 
 
 class HistoryManager:
 	def __init__(self):
-		path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps/gajim.png')
-		pix = gtk.gdk.pixbuf_new_from_file(path_to_file)
+		pix = gtkgui_helpers.get_icon_pixmap('gajim')
 		gtk.window_set_default_icon(pix) # set the icon to all newly opened windows
 
 		if not os.path.exists(LOG_DB_PATH):
@@ -290,11 +283,13 @@ class HistoryManager:
 			self._fill_logs_listview(jid)
 
 	def _get_jid_id(self, jid):
-		'''jids table has jid and jid_id
+		"""
+		jids table has jid and jid_id
 		logs table has log_id, jid_id, contact_name, time, kind, show, message
-		so to ask logs we need jid_id that matches our jid in jids table
-		this method wants jid and returns the jid_id for later sql-ing on logs
-		'''
+
+		So to ask logs we need jid_id that matches our jid in jids table this
+		method wants jid and returns the jid_id for later sql-ing on logs
+		"""
 		if jid.find('/') != -1: # if it has a /
 			jid_is_from_pm = self._jid_is_from_pm(jid)
 			if not jid_is_from_pm: # it's normal jid with resource
@@ -304,22 +299,24 @@ class HistoryManager:
 		return str(jid_id)
 
 	def _get_jid_from_jid_id(self, jid_id):
-		'''jids table has jid and jid_id
-		this method accepts jid_id and returns the jid for later sql-ing on logs
-		'''
+		"""
+		jids table has jid and jid_id
+
+		This method accepts jid_id and returns the jid for later sql-ing on logs
+		"""
 		self.cur.execute('SELECT jid FROM jids WHERE jid_id = ?', (jid_id,))
 		jid = self.cur.fetchone()[0]
 		return jid
 
 	def _jid_is_from_pm(self, jid):
-		'''if jid is gajim@conf/nkour it's likely a pm one, how we know
-		gajim@conf is not a normal guy and nkour is not his resource?
-		we ask if gajim@conf is already in jids (with type room jid)
-		this fails if user disables logging for room and only enables for
-		pm (so higly unlikely) and if we fail we do not go chaos
-		(user will see the first pm as if it was message in room's public chat)
-		and after that all okay'''
-
+		"""
+		If jid is gajim@conf/nkour it's likely a pm one, how we know gajim@conf
+		is not a normal guy and nkour is not his resource? We ask if gajim@conf
+		is already in jids (with type room jid). This fails if user disables
+		logging for room and only enables for pm (so higly unlikely) and if we
+		fail we do not go chaos (user will see the first pm as if it was message
+		in room's public chat) and after that everything is ok
+		"""
 		possible_room_jid = jid.split('/', 1)[0]
 
 		self.cur.execute('SELECT jid_id FROM jids WHERE jid = ? AND type = ?',
@@ -331,8 +328,9 @@ class HistoryManager:
 			return True
 
 	def _jid_is_room_type(self, jid):
-		'''returns True/False if given id is room type or not
-		eg. if it is room'''
+		"""
+		Return True/False if given id is room type or not eg. if it is room
+		"""
 		self.cur.execute('SELECT type FROM jids WHERE jid = ?', (jid,))
 		row = self.cur.fetchone()
 		if row is None:
@@ -343,8 +341,10 @@ class HistoryManager:
 			return False
 
 	def _fill_logs_listview(self, jid):
-		'''fill the listview with all messages that user sent to or
-		received from JID'''
+		"""
+		Fill the listview with all messages that user sent to or received from
+		JID
+		"""
 		# no need to lower jid in this context as jid is already lowered
 		# as we use those jids from db
 		jid_id = self._get_jid_id(jid)
@@ -403,7 +403,9 @@ class HistoryManager:
 					subject, nickname))
 
 	def _fill_search_results_listview(self, text):
-		'''ask db and fill listview with results that match text'''
+		"""
+		Ask db and fill listview with results that match text
+		"""
 		self.search_results_liststore.clear()
 		like_sql = '%' + text + '%'
 		self.cur.execute('''
@@ -610,8 +612,8 @@ class HistoryManager:
 			liststore, list_of_paths))
 
 	def on_search_db_button_clicked(self, widget):
-		text = self.search_entry.get_text()
-		if text == '':
+		text = self.search_entry.get_text().decode('utf-8')
+		if not text:
 			return
 
 		self.welcome_vbox.hide()
diff --git a/src/history_window.py b/src/history_window.py
index 2ad639fb7..1478720be 100644
--- a/src/history_window.py
+++ b/src/history_window.py
@@ -43,23 +43,25 @@ constants = Constants()
 
 # Completion dict
 (
-C_INFO_JID,
-C_INFO_ACCOUNT,
-C_INFO_NAME,
-C_INFO_COMPLETION
+	C_INFO_JID,
+	C_INFO_ACCOUNT,
+	C_INFO_NAME,
+	C_INFO_COMPLETION
 ) = range(4)
 
 # contact_name, date, message, time
 (
-C_LOG_JID,
-C_CONTACT_NAME,
-C_UNIXTIME,
-C_MESSAGE,
-C_TIME
+	C_LOG_JID,
+	C_CONTACT_NAME,
+	C_UNIXTIME,
+	C_MESSAGE,
+	C_TIME
 ) = range(5)
 
 class HistoryWindow:
-	'''Class for browsing logs of conversations with contacts'''
+	"""
+	Class for browsing logs of conversations with contacts
+	"""
 
 	def __init__(self, jid = None, account = None):
 		xml = gtkgui_helpers.get_glade('history_window.glade')
@@ -132,15 +134,16 @@ class HistoryWindow:
 		self.window.show_all()
 
 	def _fill_completion_dict(self):
-		'''Fill completion_dict for key auto completion. Then load history for
-		current jid (by calling another function).
+		"""
+		Fill completion_dict for key auto completion. Then load history for
+		current jid (by calling another function)
 
-		Key will be either jid or full_completion_name
-		(contact name or long description like "pm-contact from groupchat....")
+		Key will be either jid or full_completion_name (contact name or long
+		description like "pm-contact from groupchat....").
 
 		{key : (jid, account, nick_name, full_completion_name}
-		this is a generator and does pseudo-threading via idle_add()
-		'''
+		This is a generator and does pseudo-threading via idle_add().
+		"""
 		liststore = gtkgui_helpers.get_completion_liststore(self.jid_entry)
 
 		# Add all jids in logs.db:
@@ -208,8 +211,10 @@ class HistoryWindow:
 		yield False
 
 	def _get_account_for_jid(self, jid):
-		'''Return the corresponding account of the jid.
-		May be None if an account could not be found'''
+		"""
+		Return the corresponding account of the jid. May be None if an account
+		could not be found
+		"""
 		accounts = gajim.contacts.get_accounts()
 		account = None
 		for acc in accounts:
@@ -247,7 +252,9 @@ class HistoryWindow:
 			widget.select_region(0, -1) # select text
 
 	def _load_history(self, jid_or_name, account = None):
-		'''Load history for the given jid/name and show it'''
+		"""
+		Load history for the given jid/name and show it
+		"""
 		if jid_or_name and jid_or_name in self.completion_dict:
 			# a full qualified jid or a contact name was entered
 			info_jid, info_account, info_name, info_completion = self.completion_dict[jid_or_name]
@@ -324,9 +331,9 @@ class HistoryWindow:
 		self._add_lines_for_date(year, month, day)
 
 	def on_calendar_month_changed(self, widget):
-		'''asks for days in this month if they have logs it bolds them (marks
-		them)
-		'''
+		"""
+		Ask for days in this month, if they have logs it bolds them (marks them)
+		"""
 		if not self.jid:
 			return
 		year, month, day = widget.get_date() # integers
@@ -362,7 +369,9 @@ class HistoryWindow:
 		return show
 
 	def _add_lines_for_date(self, year, month, day):
-		'''adds all the lines for given date in textbuffer'''
+		"""
+		Add all the lines for given date in textbuffer
+		"""
 		self.history_buffer.set_text('') # clear the buffer first
 		self.last_time_printout = 0
 
@@ -376,7 +385,9 @@ class HistoryWindow:
 				line[5])
 
 	def _add_new_line(self, contact_name, tim, kind, show, message, subject):
-		'''add a new line in textbuffer'''
+		"""
+		Add a new line in textbuffer
+		"""
 		if not message and kind not in (constants.KIND_STATUS,
 			constants.KIND_GCSTATUS):
 			return
@@ -538,8 +549,10 @@ class HistoryWindow:
 			self.jids_to_search = gajim.logger.get_jids_in_db()
 
 	def on_results_treeview_row_activated(self, widget, path, column):
-		'''a row was double clicked, get date from row, and select it in calendar
-		which results to showing conversation logs for that date'''
+		"""
+		A row was double clicked, get date from row, and select it in calendar
+		which results to showing conversation logs for that date
+		"""
 		# get currently selected date
 		cur_year, cur_month = self.calendar.get_date()[0:2]
 		cur_month = gtkgui_helpers.make_gtk_month_python_month(cur_month)
@@ -568,7 +581,9 @@ class HistoryWindow:
 		# and highlight all that
 
 	def _scroll_to_result(self, unix_time):
-		'''scrolls to the result using unix_time and highlight line'''
+		"""
+		Scroll to the result using unix_time and highlight line
+		"""
 		start_iter = self.history_buffer.get_start_iter()
 		local_time = time.localtime(float(unix_time))
 		tim = time.strftime('%X', local_time)
@@ -602,7 +617,9 @@ class HistoryWindow:
 				' '.join(no_log_for))
 
 	def open_history(self, jid, account):
-		'''Load chat history of the specified jid'''
+		"""
+		Load chat history of the specified jid
+		"""
 		self.jid_entry.set_text(jid)
 		if account and account not in self.accounts_seen_online:
 			# Update dict to not only show bare jid
diff --git a/src/htmltextview.py b/src/htmltextview.py
index 36f3ac131..e91af9462 100644
--- a/src/htmltextview.py
+++ b/src/htmltextview.py
@@ -25,7 +25,7 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-'''
+"""
 A gtk.TextView-based renderer for XHTML-IM, as described in:
   http://www.jabber.org/jeps/jep-0071.html
 
@@ -33,8 +33,7 @@ Starting with the version posted by Gustavo Carneiro,
 I (Santiago Gala) am trying to make it more compatible
 with the markup that docutils generate, and also more
 modular.
-
-'''
+"""
 
 import gobject
 import pango
@@ -187,7 +186,6 @@ for name in BLOCK_HEAD:
 											  )
 
 def _parse_css_color(color):
-	'''_parse_css_color(css_color) -> gtk.gdk.Color'''
 	if color.startswith('rgb(') and color.endswith(')'):
 		r, g, b = [int(c)*257 for c in color[4:-1].split(',')]
 		return gtk.gdk.Color(r, g, b)
@@ -200,10 +198,11 @@ def style_iter(style):
 
 
 class HtmlHandler(xml.sax.handler.ContentHandler):
-	"""A handler to display html to a gtk textview.
+	"""
+	A handler to display html to a gtk textview
 
-	It keeps a stack of "style spans" (start/end element pairs)
-	and a stack of list counters, for nested lists.
+	It keeps a stack of "style spans" (start/end element pairs) and a stack of
+	list counters, for nested lists.
 	"""
 	def __init__(self, conv_textview, startiter):
 		xml.sax.handler.ContentHandler.__init__(self)
@@ -240,8 +239,10 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
 		callback(allocation.width*frac, *args)
 
 	def _parse_length(self, value, font_relative, block_relative, minl, maxl, callback, *args):
-		'''Parse/calc length, converting to pixels, calls callback(length, *args)
-		when the length is first computed or changes'''
+		"""
+		Parse/calc length, converting to pixels, calls callback(length, *args)
+		when the length is first computed or changes
+		"""
 		if value.endswith('%'):
 			val = float(value[:-1])
 			sign = cmp(val,0)
@@ -488,7 +489,9 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
 			# Wait maximum 1s for connection
 			socket.setdefaulttimeout(1)
 			try:
-				f = urllib2.urlopen(attrs['src'])
+				req = urllib2.Request(attrs['src'])
+				req.add_header('User-Agent', 'Gajim ' + gajim.version)
+				f = urllib2.urlopen(req)
 			except Exception, ex:
 				gajim.log.debug('Error loading image %s ' % attrs['src']  + str(ex))
 				pixbuf = None
@@ -556,11 +559,11 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
 				if h:
 					self._parse_length(h, False, False, 1, 1000, height_cb)
 				def set_size(pixbuf, w, h, dims):
-					'''FIXME: floats should be relative to the whole
-					textview, and resize with it. This needs new
-					pifbufs for every resize, gtk.gdk.Pixbuf.scale_simple
-					or similar.
-					'''
+					"""
+					FIXME: Floats should be relative to the whole textview, and
+					resize with it. This needs new pifbufs for every resize,
+					gtk.gdk.Pixbuf.scale_simple or similar.
+					"""
 					if isinstance(dims[0], float):
 						dims[0] = int(dims[0]*w)
 					elif not dims[0]:
@@ -804,6 +807,10 @@ class HtmlTextView(gtk.TextView):
 		self.connect('motion-notify-event', self.__motion_notify_event)
 		self.connect('leave-notify-event', self.__leave_event)
 		self.connect('enter-notify-event', self.__motion_notify_event)
+		self.connect('realize', self.on_html_text_view_realized)
+		self.connect('unrealize', self.on_html_text_view_unrealized)
+		self.connect('copy-clipboard', self.on_html_text_view_copy_clipboard)
+		self.get_buffer().connect_after('mark-set', self.on_text_buffer_mark_set)
 		self.get_buffer().create_tag('eol', scale = pango.SCALE_XX_SMALL)
 		self.tooltip = tooltips.BaseTooltip()
 		self.config = gajim.config
@@ -873,7 +880,45 @@ class HtmlTextView(gtk.TextView):
 		#if not eob.starts_line():
 		#    buffer_.insert(eob, '\n')
 
-
+	def on_html_text_view_copy_clipboard(self, unused_data):
+		clipboard = self.get_clipboard(gtk.gdk.SELECTION_CLIPBOARD)
+		clipboard.set_text(self.get_selected_text())
+		self.emit_stop_by_name('copy-clipboard')
+
+	def on_html_text_view_realized(self, unused_data):
+		self.get_buffer().remove_selection_clipboard(self.get_clipboard(gtk.gdk.SELECTION_PRIMARY))
+
+	def on_html_text_view_unrealized(self, unused_data):
+		self.get_buffer().add_selection_clipboard(self.get_clipboard(gtk.gdk.SELECTION_PRIMARY))
+
+	def on_text_buffer_mark_set(self, location, mark, unused_data):
+		bounds = self.get_buffer().get_selection_bounds()
+		if bounds:
+			# textview can be hidden while we add a new line in it.
+			if self.has_screen():
+				clipboard = self.get_clipboard(gtk.gdk.SELECTION_PRIMARY)
+				clipboard.set_text(self.get_selected_text())
+
+	def get_selected_text(self):
+		bounds = self.get_buffer().get_selection_bounds()
+		selection = ''
+		if bounds:
+			(search_iter, end) = bounds
+
+			while (search_iter.compare(end)):
+				character = search_iter.get_char()
+				if character == u'\ufffc':
+					anchor = search_iter.get_child_anchor()
+					if anchor:
+						text = anchor.get_data('plaintext')
+						if text:
+							selection+=text
+					else:
+						selection+=character
+				else:
+					selection+=character
+				search_iter.forward_char()
+		return selection
 
 change_cursor = None
 
@@ -898,14 +943,16 @@ if __name__ == '__main__':
 
 	htmlview = ConversationTextview(None)
 
-	path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png')
+	path = gtkgui_helpers.get_icon_path('gajim-muc_separator')
 	# use this for hr
-	htmlview.tv.focus_out_line_pixbuf =  gtk.gdk.pixbuf_new_from_file(path_to_file)
-
+	htmlview.tv.focus_out_line_pixbuf =  gtk.gdk.pixbuf_new_from_file(path)
 
 	tooltip = tooltips.BaseTooltip()
+
 	def on_textview_motion_notify_event(widget, event):
-		'''change the cursor to a hand when we are over a mail or an url'''
+		"""
+		Change the cursor to a hand when we are over a mail or an url
+		"""
 		global change_cursor
 		pointer_x, pointer_y = htmlview.tv.window.get_pointer()[0:2]
 		x, y = htmlview.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer_x,
diff --git a/src/ipython_view.py b/src/ipython_view.py
index 4bc8a9564..a901643f6 100644
--- a/src/ipython_view.py
+++ b/src/ipython_view.py
@@ -29,8 +29,8 @@
 
 ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-'''
-Provides IPython console widget.
+"""
+Provides IPython console widget
 
 @author: Eitan Isaacson
 @organization: IBM Corporation
@@ -40,7 +40,7 @@ Provides IPython console widget.
 All rights reserved. This program and the accompanying materials are made
 available under the terms of the BSD which accompanies this distribution, and
 is available at U{http://www.opensource.org/licenses/bsd-license.php}
-'''
+"""
 
 import gtk, gobject
 import re
@@ -55,10 +55,10 @@ except ImportError:
   IPython = None
 
 class IterableIPShell:
-  '''
+  """
   Create an IPython instance. Does not start a blocking event loop,
   instead allow single iterations. This allows embedding in GTK+
-  without blockage.
+  without blockage
 
   @ivar IP: IPython instance.
   @type IP: IPython.iplib.InteractiveShell
@@ -70,12 +70,10 @@ class IterableIPShell:
   @type history_level: integer
   @ivar complete_sep: Seperation delimeters for completion function.
   @type complete_sep: _sre.SRE_Pattern
-  '''
-  def __init__(self,argv=[],user_ns=None,user_global_ns=None,
-               cin=None, cout=None,cerr=None, input_func=None):
-    '''
-
-
+  """
+  def __init__(self,argv=[],user_ns=None,user_global_ns=None, cin=None,
+		  cout=None,cerr=None, input_func=None):
+    """
     @param argv: Command line options for IPython
     @type argv: list
     @param user_ns: User namespace.
@@ -90,7 +88,7 @@ class IterableIPShell:
     @type cerr: IO stream
     @param input_func: Replacement for builtin raw_input()
     @type input_func: function
-    '''
+    """
     if input_func:
       IPython.iplib.raw_input_original = input_func
     if cin:
@@ -121,9 +119,9 @@ class IterableIPShell:
     self.complete_sep =  re.compile('[\s\{\}\[\]\(\)]')
 
   def execute(self):
-    '''
-    Executes the current line provided by the shell object.
-    '''
+    """
+    Execute the current line provided by the shell object
+    """
     self.history_level = 0
     orig_stdout = sys.stdout
     sys.stdout = IPython.Shell.Term.cout
@@ -156,32 +154,32 @@ class IterableIPShell:
     sys.stdout = orig_stdout
 
   def historyBack(self):
-    '''
-    Provides one history command back.
+    """
+    Provide one history command back
 
     @return: The command string.
     @rtype: string
-    '''
+    """
     self.history_level -= 1
     return self._getHistory()
 
   def historyForward(self):
-    '''
-    Provides one history command forward.
+    """
+    Provide one history command forward
 
     @return: The command string.
     @rtype: string
-    '''
+    """
     self.history_level += 1
     return self._getHistory()
 
   def _getHistory(self):
-    '''
-    Get's the command string of the current history level.
+    """
+    Get the command string of the current history level
 
     @return: Historic command string.
     @rtype: string
-    '''
+    """
     try:
       rv = self.IP.user_ns['In'][self.history_level].strip('\n')
     except IndexError:
@@ -190,17 +188,17 @@ class IterableIPShell:
     return rv
 
   def updateNamespace(self, ns_dict):
-    '''
-    Add the current dictionary to the shell namespace.
+    """
+    Add the current dictionary to the shell namespace
 
     @param ns_dict: A dictionary of symbol-values.
     @type ns_dict: dictionary
-    '''
+    """
     self.IP.user_ns.update(ns_dict)
 
   def complete(self, line):
-    '''
-    Returns an auto completed line and/or posibilities for completion.
+    """
+    Returns an auto completed line and/or posibilities for completion
 
     @param line: Given line so far.
     @type line: string
@@ -208,7 +206,7 @@ class IterableIPShell:
     @return: Line completed as for as possible,
     and possible further completions.
     @rtype: tuple
-    '''
+    """
     split_line = self.complete_sep.split(line)
     possibilities = self.IP.complete(split_line[-1])
 
@@ -222,7 +220,9 @@ class IterableIPShell:
             return True
 
     def common_prefix(seq):
-        """Returns the common prefix of a sequence of strings"""
+        """
+		  Return the common prefix of a sequence of strings
+		  """
         return "".join(c for i, c in enumerate(seq[0])
                 if all(s.startswith(c, i) for s in seq))
     if possibilities:
@@ -233,8 +233,8 @@ class IterableIPShell:
 
 
   def shell(self, cmd,verbose=0,debug=0,header=''):
-    '''
-    Replacement method to allow shell commands without them blocking.
+    """
+    Replacement method to allow shell commands without them blocking
 
     @param cmd: Shell command to execute.
     @type cmd: string
@@ -244,7 +244,7 @@ class IterableIPShell:
     @type debug: integer
     @param header: Header to be printed before output
     @type header: string
-    '''
+    """
     if verbose or debug: print header+cmd
     # flush stdout so we don't mangle python's buffering
     if not debug:
@@ -254,8 +254,8 @@ class IterableIPShell:
       input_.close()
 
 class ConsoleView(gtk.TextView):
-  '''
-  Specialized text view for console-like workflow.
+  """
+  Specialized text view for console-like workflow
 
   @cvar ANSI_COLORS: Mapping of terminal colors to X11 names.
   @type ANSI_COLORS: dictionary
@@ -268,7 +268,8 @@ class ConsoleView(gtk.TextView):
   @type mark: gtk.TextMark
   @ivar line_start: Start of command line mark.
   @type line_start: gtk.TextMark
-  '''
+  """
+
   ANSI_COLORS =  {'0;30': 'Black',     '0;31': 'Red',
                   '0;32': 'Green',     '0;33': 'Brown',
                   '0;34': 'Blue',      '0;35': 'Purple',
@@ -279,9 +280,9 @@ class ConsoleView(gtk.TextView):
                   '1;36': 'LightCyan', '1;37': 'White'}
 
   def __init__(self):
-    '''
-    Initialize console view.
-    '''
+    """
+    Initialize console view
+    """
     gtk.TextView.__init__(self)
     self.modify_font(pango.FontDescription('Mono'))
     self.set_cursor_visible(True)
@@ -305,14 +306,14 @@ class ConsoleView(gtk.TextView):
     gobject.idle_add(self._write, text, editable)
 
   def _write(self, text, editable=False):
-    '''
-    Write given text to buffer.
+    """
+    Write given text to buffer
 
     @param text: Text to append.
     @type text: string
     @param editable: If true, added text is editable.
     @type editable: boolean
-    '''
+    """
     segments = self.color_pat.split(text)
     segment = segments.pop(0)
     start_mark = self.text_buffer.create_mark(None,
@@ -339,12 +340,12 @@ class ConsoleView(gtk.TextView):
     gobject.idle_add(self._showPrompt, prompt)
 
   def _showPrompt(self, prompt):
-    '''
-    Prints prompt at start of line.
+    """
+    Print prompt at start of line
 
     @param prompt: Prompt to print.
     @type prompt: string
-    '''
+    """
     self._write(prompt)
     self.text_buffer.move_mark(self.line_start,
                                self.text_buffer.get_end_iter())
@@ -353,24 +354,24 @@ class ConsoleView(gtk.TextView):
     gobject.idle_add(self._changeLine, text)
 
   def _changeLine(self, text):
-    '''
-    Replace currently entered command line with given text.
+    """
+    Replace currently entered command line with given text
 
     @param text: Text to use as replacement.
     @type text: string
-    '''
+    """
     iter_ = self.text_buffer.get_iter_at_mark(self.line_start)
     iter_.forward_to_line_end()
     self.text_buffer.delete(self.text_buffer.get_iter_at_mark(self.line_start), iter_)
     self._write(text, True)
 
   def getCurrentLine(self):
-    '''
-    Get text in current command line.
+    """
+    Get text in current command line
 
     @return: Text of current command line.
     @rtype: string
-    '''
+    """
     rv = self.text_buffer.get_slice(
       self.text_buffer.get_iter_at_mark(self.line_start),
       self.text_buffer.get_end_iter(), False)
@@ -380,12 +381,12 @@ class ConsoleView(gtk.TextView):
     gobject.idle_add(self._showReturned, text)
 
   def _showReturned(self, text):
-    '''
-    Show returned text from last command and print new prompt.
+    """
+    Show returned text from last command and print new prompt
 
     @param text: Text to show.
     @type text: string
-    '''
+    """
     iter_ = self.text_buffer.get_iter_at_mark(self.line_start)
     iter_.forward_to_line_end()
     self.text_buffer.apply_tag_by_name(
@@ -400,10 +401,10 @@ class ConsoleView(gtk.TextView):
     self.text_buffer.place_cursor(self.text_buffer.get_end_iter())
 
   def onKeyPress(self, widget, event):
-    '''
+    """
     Key press callback used for correcting behavior for console-like
     interfaces. For example 'home' should go to prompt, not to begining of
-    line.
+    line
 
     @param widget: Widget that key press accored in.
     @type widget: gtk.Widget
@@ -412,7 +413,7 @@ class ConsoleView(gtk.TextView):
 
     @return: Return True if event should not trickle.
     @rtype: boolean
-    '''
+    """
     insert_mark = self.text_buffer.get_insert()
     insert_iter = self.text_buffer.get_iter_at_mark(insert_mark)
     selection_mark = self.text_buffer.get_selection_bound()
@@ -445,9 +446,9 @@ class ConsoleView(gtk.TextView):
     return self.onKeyPressExtend(event)
 
   def onKeyPressExtend(self, event):
-    '''
-    For some reason we can't extend onKeyPress directly (bug #500900).
-    '''
+    """
+    For some reason we can't extend onKeyPress directly (bug #500900)
+    """
     pass
 
 class IPythonView(ConsoleView, IterableIPShell):
@@ -456,9 +457,9 @@ class IPythonView(ConsoleView, IterableIPShell):
   a GTK+ IPython console.
   '''
   def __init__(self):
-    '''
-    Initialize. Redirect I/O to console.
-    '''
+    """
+    Initialize. Redirect I/O to console
+    """
     ConsoleView.__init__(self)
     self.cout = StringIO()
     IterableIPShell.__init__(self, cout=self.cout,cerr=self.cout,
@@ -470,24 +471,24 @@ class IPythonView(ConsoleView, IterableIPShell):
     self.interrupt = False
 
   def raw_input(self, prompt=''):
-    '''
-    Custom raw_input() replacement. Get's current line from console buffer.
+    """
+    Custom raw_input() replacement. Get's current line from console buffer
 
     @param prompt: Prompt to print. Here for compatability as replacement.
     @type prompt: string
 
     @return: The current command line text.
     @rtype: string
-    '''
+    """
     if self.interrupt:
       self.interrupt = False
       raise KeyboardInterrupt
     return self.getCurrentLine()
 
   def onKeyPressExtend(self, event):
-    '''
+    """
     Key press callback with plenty of shell goodness, like history,
-    autocompletions, etc.
+    autocompletions, etc
 
     @param widget: Widget that key press occured in.
     @type widget: gtk.Widget
@@ -496,7 +497,7 @@ class IPythonView(ConsoleView, IterableIPShell):
 
     @return: True if event should not trickle.
     @rtype: boolean
-    '''
+    """
     if event.state & gtk.gdk.CONTROL_MASK and event.keyval == 99:
       self.interrupt = True
       self._processLine()
@@ -524,9 +525,9 @@ class IPythonView(ConsoleView, IterableIPShell):
       return True
 
   def _processLine(self):
-    '''
-    Process current command line.
-    '''
+    """
+    Process current command line
+    """
     self.history_pos = 0
     self.execute()
     rv = self.cout.getvalue()
diff --git a/src/message_control.py b/src/message_control.py
index eaf3bf5fd..e01fee934 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -39,7 +39,10 @@ TYPE_PM = 'pm'
 ####################
 
 class MessageControl(object):
-	'''An abstract base widget that can embed in the gtk.Notebook of a MessageWindow'''
+	"""
+	An abstract base widget that can embed in the gtk.Notebook of a
+	MessageWindow
+	"""
 
 	def __init__(self, type_id, parent_win, widget_name, contact, account, resource = None):
 		# dict { cb id : widget}
@@ -67,57 +70,87 @@ class MessageControl(object):
 		return fjid
 
 	def set_control_active(self, state):
-		'''Called when the control becomes active (state is True)
-		or inactive (state is False)'''
+		"""
+		Called when the control becomes active (state is True) 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
+		"""
+		Called to check if control can be minimized
+
+		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
+		"""
+		Called to check if control can be closed without loosing data.
+		returns True if control can be closed safely else False
+
+		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.
+			on_response_minimize):
+		"""
+		Called to check is a control is allowed to shutdown.
 		If a control is not in a suitable shutdown state this method
 		should call on_response_no, else on_response_yes or
-		on_response_minimize '''
-		# NOTE: Derived classes MAY implement this
+		on_response_minimize
+
+		Derived classes MAY implement this.
+		"""
 		on_response_yes(self)
 
 	def shutdown(self):
-		# NOTE: Derived classes MUST implement this
+		"""
+		Derived classes MUST implement this
+		"""
 		pass
 
 	def repaint_themed_widgets(self):
-		pass # NOTE: Derived classes SHOULD implement this
+		"""
+		Derived classes SHOULD implement this
+		"""
+		pass
 
 	def update_ui(self):
-		pass # NOTE: Derived classes SHOULD implement this
+		"""
+		Derived classes SHOULD implement this
+		"""
+		pass
 
 	def toggle_emoticons(self):
-		pass # NOTE: Derived classes MAY implement this
+		"""
+		Derived classes MAY implement this
+		"""
+		pass
 
 	def update_font(self):
-		pass # NOTE: Derived classes SHOULD implement this
+		"""
+		Derived classes SHOULD implement this
+		"""
+		pass
 
 	def update_tags(self):
-		pass # NOTE: Derived classes SHOULD implement this
+		"""
+		Derived classes SHOULD implement this
+		"""
+		pass
 
 	def get_tab_label(self, chatstate):
-		'''Return a suitable tab label string.  Returns a tuple such as:
-		(label_str, color) either of which can be None
-		if chatstate is given that means we have HE SENT US a chatstate and
-		we want it displayed'''
-		# NOTE: Derived classes MUST implement this
+		"""
+		Return a suitable tab label string. Returns a tuple such as: (label_str,
+		color) either of which can be None if chatstate is given that means we
+		have HE SENT US a chatstate and we want it displayed
+
+		Derivded classes MUST implement this.
+		"""
 		# Return a markup'd label and optional gtk.Color in a tupple like:
-		#return (label_str, None)
+		# return (label_str, None)
 		pass
 
 	def get_tab_image(self, count_unread=True):
@@ -126,11 +159,15 @@ class MessageControl(object):
 		return None
 
 	def prepare_context_menu(self):
-		# NOTE: Derived classes SHOULD implement this
+		"""
+		Derived classes SHOULD implement this
+		"""
 		return None
 
 	def chat_buttons_set_visible(self, state):
-		# NOTE: Derived classes MAY implement this
+		"""
+		Derived classes MAY implement this
+		"""
 		self.hide_chat_buttons = state
 
 	def got_connected(self):
@@ -170,8 +207,8 @@ class MessageControl(object):
 			self.print_esession_details()
 
 	def send_message(self, message, keyID='', type_='chat', chatstate=None,
-	msg_id=None, composing_xep=None, resource=None, user_nick=None, xhtml=None,
-	callback=None, callback_args=[]):
+			msg_id=None, composing_xep=None, resource=None, user_nick=None,
+			xhtml=None, callback=None, callback_args=[]):
 		# Send the given message to the active tab.
 		# Doesn't return None if error
 		jid = self.contact.jid
diff --git a/src/message_textview.py b/src/message_textview.py
index 40ba81067..ca9368244 100644
--- a/src/message_textview.py
+++ b/src/message_textview.py
@@ -21,15 +21,20 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
+import gc
+
 import gtk
 import gobject
 import pango
+
 import gtkgui_helpers
 from common import gajim
 
 class MessageTextView(gtk.TextView):
-	'''Class for the message textview (where user writes new messages)
-	for chat/groupchat windows'''
+	"""
+	Class for the message textview (where user writes new messages) for
+	chat/groupchat windows
+	"""
 	__gsignals__ = dict(
 		mykeypress = (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION,
 				None, # return value
@@ -52,31 +57,31 @@ class MessageTextView(gtk.TextView):
 		self.set_pixels_below_lines(2)
 
 		self.lang = None # Lang used for spell checking
-		buffer = self.get_buffer()
+		_buffer = self.get_buffer()
 		self.begin_tags = {}
 		self.end_tags = {}
 		self.color_tags = []
 		self.fonts_tags = []
 		self.other_tags = {}
-		self.other_tags['bold'] = buffer.create_tag('bold')
+		self.other_tags['bold'] = _buffer.create_tag('bold')
 		self.other_tags['bold'].set_property('weight', pango.WEIGHT_BOLD)
 		self.begin_tags['bold'] = '<strong>'
 		self.end_tags['bold'] = '</strong>'
-		self.other_tags['italic'] = buffer.create_tag('italic')
+		self.other_tags['italic'] = _buffer.create_tag('italic')
 		self.other_tags['italic'].set_property('style', pango.STYLE_ITALIC)
 		self.begin_tags['italic'] = '<em>'
 		self.end_tags['italic'] = '</em>'
-		self.other_tags['underline'] = buffer.create_tag('underline')
+		self.other_tags['underline'] = _buffer.create_tag('underline')
 		self.other_tags['underline'].set_property('underline', pango.UNDERLINE_SINGLE)
 		self.begin_tags['underline'] = '<span style="text-decoration: underline;">'
 		self.end_tags['underline'] = '</span>'
-		self.other_tags['strike'] = buffer.create_tag('strike')
+		self.other_tags['strike'] = _buffer.create_tag('strike')
 		self.other_tags['strike'].set_property('strikethrough', True)
 		self.begin_tags['strike'] = '<span style="text-decoration: line-through;">'
 		self.end_tags['strike'] = '</span>'
 
 	def make_clickable_urls(self, text):
-		buffer = self.get_buffer()
+		_buffer = self.get_buffer()
 
 		start = 0
 		end = 0
@@ -91,7 +96,7 @@ class MessageTextView(gtk.TextView):
 				text_before_special_text = text[index:start]
 			else:
 				text_before_special_text = ''
-			end_iter = buffer.get_end_iter()
+			end_iter = _buffer.get_end_iter()
 			# we insert normal text
 			new_text += text_before_special_text + \
 			'<a href="'+ url +'">' + url + '</a>'
@@ -104,50 +109,49 @@ class MessageTextView(gtk.TextView):
 		return new_text # the position after *last* special text
 
 	def get_active_tags(self):
-		buffer = self.get_buffer()
 		start, finish = self.get_active_iters()
 		active_tags = []
 		for tag in start.get_tags():
 			active_tags.append(tag.get_property('name'))
-		return 	active_tags
+		return active_tags
 
 	def get_active_iters(self):
-		buffer = self.get_buffer()
-		return_val = buffer.get_selection_bounds()
+		_buffer = self.get_buffer()
+		return_val = _buffer.get_selection_bounds()
 		if return_val: # if sth was selected
 			start, finish = return_val[0], return_val[1]
 		else:
-			start, finish = buffer.get_bounds()
+			start, finish = _buffer.get_bounds()
 		return (start, finish)
 
 	def set_tag(self, widget, tag):
-		buffer = self.get_buffer()
+		_buffer = self.get_buffer()
 		start, finish = self.get_active_iters()
 		if start.has_tag(self.other_tags[tag]):
-			buffer.remove_tag_by_name(tag, start, finish)
+			_buffer.remove_tag_by_name(tag, start, finish)
 		else:
 			if tag == 'underline':
-				buffer.remove_tag_by_name('strike', start, finish)
+				_buffer.remove_tag_by_name('strike', start, finish)
 			elif tag == 'strike':
-				buffer.remove_tag_by_name('underline', start, finish)
-			buffer.apply_tag_by_name(tag, start, finish)
+				_buffer.remove_tag_by_name('underline', start, finish)
+			_buffer.apply_tag_by_name(tag, start, finish)
 
 	def clear_tags(self, widget):
-		buffer = self.get_buffer()
+		_buffer = self.get_buffer()
 		start, finish = self.get_active_iters()
-		buffer.remove_all_tags(start, finish)
+		_buffer.remove_all_tags(start, finish)
 
 	def color_set(self, widget, response, color):
 		if response == -6:
 			widget.destroy()
 			return
-		buffer = self.get_buffer()
+		_buffer = self.get_buffer()
 		color = color.get_current_color()
 		widget.destroy()
 		color_string = gtkgui_helpers.make_color_string(color)
 		tag_name = 'color' + color_string
 		if not tag_name in self.color_tags:
-			tagColor = buffer.create_tag(tag_name)
+			tagColor = _buffer.create_tag(tag_name)
 			tagColor.set_property('foreground', color_string)
 			self.begin_tags[tag_name] = '<span style="color: ' + color_string + ';">'
 			self.end_tags[tag_name] = '</span>'
@@ -156,16 +160,16 @@ class MessageTextView(gtk.TextView):
 		start, finish = self.get_active_iters()
 
 		for tag in self.color_tags:
-			buffer.remove_tag_by_name(tag, start, finish)
+			_buffer.remove_tag_by_name(tag, start, finish)
 
-		buffer.apply_tag_by_name(tag_name, start, finish)
+		_buffer.apply_tag_by_name(tag_name, start, finish)
 
 	def font_set(self, widget, response, font):
 		if response == -6:
 			widget.destroy()
 			return
 
-		buffer = self.get_buffer()
+		_buffer = self.get_buffer()
 
 		font = font.get_font_name()
 		font_desc = pango.FontDescription(font)
@@ -179,7 +183,7 @@ class MessageTextView(gtk.TextView):
 
 		tag_name = 'font' + font
 		if not tag_name in self.fonts_tags:
-			tagFont = buffer.create_tag(tag_name)
+			tagFont = _buffer.create_tag(tag_name)
 			tagFont.set_property('font', family + ' ' + str(size))
 			self.begin_tags[tag_name] = \
 				'<span style="font-family: ' + family + '; ' + \
@@ -190,27 +194,27 @@ class MessageTextView(gtk.TextView):
 		start, finish = self.get_active_iters()
 
 		for tag in self.fonts_tags:
-			buffer.remove_tag_by_name(tag, start, finish)
+			_buffer.remove_tag_by_name(tag, start, finish)
 
-		buffer.apply_tag_by_name(tag_name, start, finish)
+		_buffer.apply_tag_by_name(tag_name, start, finish)
 
 		if weight == pango.WEIGHT_BOLD:
-			buffer.apply_tag_by_name('bold', start, finish)
+			_buffer.apply_tag_by_name('bold', start, finish)
 		else:
-			buffer.remove_tag_by_name('bold', start, finish)
+			_buffer.remove_tag_by_name('bold', start, finish)
 
 		if style == pango.STYLE_ITALIC:
-			buffer.apply_tag_by_name('italic', start, finish)
+			_buffer.apply_tag_by_name('italic', start, finish)
 		else:
-			buffer.remove_tag_by_name('italic', start, finish)
+			_buffer.remove_tag_by_name('italic', start, finish)
 
 	def get_xhtml(self):
-		buffer = self.get_buffer()
-		old = buffer.get_start_iter()
+		_buffer = self.get_buffer()
+		old = _buffer.get_start_iter()
 		tags = {}
 		tags['bold'] = False
-		iter = buffer.get_start_iter()
-		old = buffer.get_start_iter()
+		iter = _buffer.get_start_iter()
+		old = _buffer.get_start_iter()
 		text = ''
 		modified = False
 
@@ -228,7 +232,7 @@ class MessageTextView(gtk.TextView):
 			text += self.begin_tags[tag_name]
 			modified = True
 		while (iter.forward_to_tag_toggle(None) and not iter.is_end()):
-			text += xhtml_special(buffer.get_text(old, iter))
+			text += xhtml_special(_buffer.get_text(old, iter))
 			old.forward_to_tag_toggle(None)
 			new_tags, old_tags, end_tags = [], [], []
 			for tag in iter.get_toggled_tags(True):
@@ -260,7 +264,7 @@ class MessageTextView(gtk.TextView):
 			for tag in old_tags:
 				text += self.begin_tags[tag]
 
-		text += xhtml_special(buffer.get_text(old, buffer.get_end_iter()))
+		text += xhtml_special(_buffer.get_text(old, _buffer.get_end_iter()))
 		for tag in iter.get_toggled_tags(False):
 			tag_name = tag.get_property('name')
 			if tag_name not in self.end_tags:
@@ -272,16 +276,16 @@ class MessageTextView(gtk.TextView):
 		else:
 			return None
 
-
 	def destroy(self):
-		import gc
-		gobject.idle_add(lambda:gc.collect())
+		gobject.idle_add(gc.collect)
 
 	def clear(self, widget = None):
-		'''clear text in the textview'''
-		buffer_ = self.get_buffer()
-		start, end = buffer_.get_bounds()
-		buffer_.delete(start, end)
+		"""
+		Clear text in the textview
+		"""
+		_buffer = self.get_buffer()
+		start, end = _buffer.get_bounds()
+		_buffer.delete(start, end)
 
 
 # We register depending on keysym and modifier some bindings
diff --git a/src/message_window.py b/src/message_window.py
index 8adb580d6..7c97f3fb0 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -42,8 +42,9 @@ from common import gajim
 ####################
 
 class MessageWindow(object):
-	'''Class for windows which contain message like things; chats,
-	groupchats, etc.'''
+	"""
+	Class for windows which contain message like things; chats, groupchats, etc
+	"""
 
 	# DND_TARGETS is the targets needed by drag_source_set and drag_dest_set
 	DND_TARGETS = [('GAJIM_TAB', 0, 81)]
@@ -160,7 +161,9 @@ class MessageWindow(object):
 			self.account = new_name
 
 	def change_jid(self, account, old_jid, new_jid):
-		''' call then when the full jid of a contral change'''
+		"""
+		Called when the full jid of the control is changed
+		"""
 		if account not in self._controls:
 			return
 		if old_jid not in self._controls[account]:
@@ -417,7 +420,9 @@ class MessageWindow(object):
 		return True
 
 	def _on_close_button_clicked(self, button, control):
-		'''When close button is pressed: close a tab'''
+		"""
+		When close button is pressed: close a tab
+		"""
 		self.remove_tab(control, self.CLOSE_CLOSE_BUTTON)
 
 	def show_icon(self):
@@ -444,7 +449,9 @@ class MessageWindow(object):
 			self.window.set_icon(icon.get_pixbuf())
 
 	def show_title(self, urgent=True, control=None):
-		'''redraw the window's title'''
+		"""
+		Redraw the window's title
+		"""
 		if not control:
 			control = self.get_active_control()
 		if not control:
@@ -512,8 +519,10 @@ class MessageWindow(object):
 		self.window.present()
 
 	def remove_tab(self, ctrl, method, reason = None, force = False):
-		'''reason is only for gc (offline status message)
-		if force is True, do not ask any confirmation'''
+		"""
+		Reason is only for gc (offline status message) if force is True, do not
+		ask any confirmation
+		"""
 		def close(ctrl):
 			if reason is not None: # We are leaving gc with a status message
 				ctrl.shutdown(reason)
@@ -616,7 +625,9 @@ class MessageWindow(object):
 		self.show_icon()
 
 	def repaint_themed_widgets(self):
-		'''Repaint controls in the window with theme color'''
+		"""
+		Repaint controls in the window with theme color
+		"""
 		# iterate through controls and repaint
 		for ctrl in self.controls():
 			ctrl.repaint_themed_widgets()
@@ -650,21 +661,11 @@ class MessageWindow(object):
 	def get_origin(self):
 		return self.window.window.get_origin()
 
-	def toggle_emoticons(self):
-		for ctrl in self.controls():
-			ctrl.toggle_emoticons()
-
-	def update_font(self):
-		for ctrl in self.controls():
-			ctrl.update_font()
-
-	def update_tags(self):
-		for ctrl in self.controls():
-			ctrl.update_tags()
-
 	def get_control(self, key, acct):
-		'''Return the MessageControl for jid or n, where n is a notebook page index.
-		When key is an int index acct may be None'''
+		"""
+		Return the MessageControl for jid or n, where n is a notebook page index.
+		When key is an int index acct may be None
+		"""
 		if isinstance(key, str):
 			key = unicode(key, 'utf-8')
 
@@ -686,7 +687,9 @@ class MessageWindow(object):
 		return (acct in self._controls and jid in self._controls[acct])
 
 	def change_key(self, old_jid, new_jid, acct):
-		'''Change the JID key of a control'''
+		"""
+		Change the JID key of a control
+		"""
 		try:
 			# Check if controls exists
 			ctrl = self._controls[acct][old_jid]
@@ -814,10 +817,10 @@ class MessageWindow(object):
 			control.msg_textview.grab_focus()
 
 	def get_tab_at_xy(self, x, y):
-		'''Thanks to Gaim
-		Return the tab under xy and
-		if its nearer from left or right side of the tab
-		'''
+		"""
+		Return the tab under xy and if its nearer from left or right side of the
+		tab
+		"""
 		page_num = -1
 		to_right = False
 		horiz = self.notebook.get_tab_pos() == gtk.POS_TOP or \
@@ -844,7 +847,9 @@ class MessageWindow(object):
 		return (page_num, to_right)
 
 	def find_page_num_according_to_tab_label(self, tab_label):
-		'''Find the page num of the tab label'''
+		"""
+		Find the page num of the tab label
+		"""
 		page_num = -1
 		for i in xrange(self.notebook.get_n_pages()):
 			page = self.notebook.get_nth_page(i)
@@ -856,18 +861,21 @@ class MessageWindow(object):
 
 ################################################################################
 class MessageWindowMgr(gobject.GObject):
-	'''A manager and factory for MessageWindow objects'''
+	"""
+	A manager and factory for MessageWindow objects
+	"""
+
 	__gsignals__ = {
 		'window-delete': (gobject.SIGNAL_RUN_LAST, None, (object,)),
 	}
 
 	# These constants map to common.config.opt_one_window_types indices
 	(
-	ONE_MSG_WINDOW_NEVER,
-	ONE_MSG_WINDOW_ALWAYS,
-	ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER,
-	ONE_MSG_WINDOW_PERACCT,
-	ONE_MSG_WINDOW_PERTYPE,
+		ONE_MSG_WINDOW_NEVER,
+		ONE_MSG_WINDOW_ALWAYS,
+		ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER,
+		ONE_MSG_WINDOW_PERACCT,
+		ONE_MSG_WINDOW_PERTYPE,
 	) = range(5)
 	# A key constant for the main window in ONE_MSG_WINDOW_ALWAYS mode
 	MAIN_WIN = 'main'
@@ -875,12 +883,14 @@ class MessageWindowMgr(gobject.GObject):
 	ROSTER_MAIN_WIN = 'roster'
 
 	def __init__(self, parent_window, parent_paned):
-		''' A dictionary of windows; the key depends on the config:
-		ONE_MSG_WINDOW_NEVER: The key is the contact JID
-		ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN
-		ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: The key is MessageWindowMgr.MAIN_WIN
-		ONE_MSG_WINDOW_PERACCT: The key is the account name
-		ONE_MSG_WINDOW_PERTYPE: The key is a message type constant'''
+		"""
+		A dictionary of windows; the key depends on the config:
+			ONE_MSG_WINDOW_NEVER: The key is the contact JID
+			ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN
+			ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: The key is MessageWindowMgr.MAIN_WIN
+			ONE_MSG_WINDOW_PERACCT: The key is the account name
+			ONE_MSG_WINDOW_PERTYPE: The key is a message type constant
+		"""
 		gobject.GObject.__init__(self)
 		self._windows = {}
 
@@ -931,7 +941,9 @@ class MessageWindowMgr(gobject.GObject):
 			return False
 
 	def _resize_window(self, win, acct, type_):
-		'''Resizes window according to config settings'''
+		"""
+		Resizes window according to config settings
+		"""
 		if self.mode in (self.ONE_MSG_WINDOW_ALWAYS,
 				self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER):
 			size = (gajim.config.get('msgwin-width'),
@@ -958,7 +970,9 @@ class MessageWindowMgr(gobject.GObject):
 			win.parent_paned.set_position(parent_size[0])
 
 	def _position_window(self, win, acct, type_):
-		'''Moves window according to config settings'''
+		"""
+		Moves window according to config settings
+		"""
 		if (self.mode in [self.ONE_MSG_WINDOW_NEVER,
 		self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER]):
 			return
@@ -1054,15 +1068,19 @@ class MessageWindowMgr(gobject.GObject):
 				return
 
 	def get_control(self, jid, acct):
-		'''Amongst all windows, return the MessageControl for jid'''
+		"""
+		Amongst all windows, return the MessageControl for jid
+		"""
 		win = self.get_window(jid, acct)
 		if win:
 			return win.get_control(jid, acct)
 		return None
 
 	def get_gc_control(self, jid, acct):
-		'''Same as get_control. Was briefly required, is not any more.
-May be useful some day in the future?'''
+		"""
+		Same as get_control. Was briefly required, is not any more. May be useful
+		some day in the future?
+		"""
 		ctrl = self.get_control(jid, acct)
 		if ctrl and ctrl.type_id == message_control.TYPE_GC:
 			return ctrl
diff --git a/src/negotiation.py b/src/negotiation.py
index bd5a32123..a7cf5c043 100644
--- a/src/negotiation.py
+++ b/src/negotiation.py
@@ -27,14 +27,15 @@ from common import gajim
 from common import xmpp
 
 def describe_features(features):
-	'''a human-readable description of the features that have been negotiated'''
+	"""
+	A human-readable description of the features that have been negotiated
+	"""
 	if features['logging'] == 'may':
 		return _('- messages will be logged')
 	elif features['logging'] == 'mustnot':
 		return _('- messages will not be logged')
 
 class FeatureNegotiationWindow:
-	'''FeatureNegotiotionWindow class'''
 	def __init__(self, account, jid, session, form):
 		self.account = account
 		self.jid = jid
diff --git a/src/network_manager_listener.py b/src/network_manager_listener.py
index 15a40bbf6..3f1f774ca 100644
--- a/src/network_manager_listener.py
+++ b/src/network_manager_listener.py
@@ -26,21 +26,27 @@ from common import gajim
 
 
 def device_now_active(self, *args):
-	'''For Network Manager 0.6'''
+	"""
+	For Network Manager 0.6
+	"""
 	for connection in gajim.connections.itervalues():
 		if gajim.config.get_per('accounts', connection.name,
 		'listen_to_network_manager') and connection.time_to_reconnect:
 			connection._reconnect()
 
 def device_no_longer_active(self, *args):
-	'''For Network Manager 0.6'''
+	"""
+	For Network Manager 0.6
+	"""
 	for connection in gajim.connections.itervalues():
 		if gajim.config.get_per('accounts', connection.name,
 		'listen_to_network_manager') and connection.connected > 1:
 			connection._disconnectedReconnCB()
 
 def state_changed(state):
-	'''For Network Manager 0.7'''
+	"""
+	For Network Manager 0.7
+	"""
 	if props.Get("org.freedesktop.NetworkManager", "State") == 3:
 		for connection in gajim.connections.itervalues():
 			if gajim.config.get_per('accounts', connection.name,
diff --git a/src/notify.py b/src/notify.py
index 3d9eb6051..37a7fd267 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -69,7 +69,9 @@ def server_display(server):
 	win.present()
 
 def get_show_in_roster(event, account, contact, session=None):
-	'''Return True if this event must be shown in roster, else False'''
+	"""
+	Return True if this event must be shown in roster, else False
+	"""
 	if event == 'gc_message_received':
 		return True
 	num = get_advanced_notification(event, account, contact)
@@ -84,7 +86,9 @@ def get_show_in_roster(event, account, contact, session=None):
 	return True
 
 def get_show_in_systray(event, account, contact, type_=None):
-	'''Return True if this event must be shown in systray, else False'''
+	"""
+	Return True if this event must be shown in systray, else False
+	"""
 	num = get_advanced_notification(event, account, contact)
 	if num is not None:
 		if gajim.config.get_per('notifications', str(num), 'systray') == 'yes':
@@ -98,8 +102,9 @@ def get_show_in_systray(event, account, contact, type_=None):
 	return gajim.config.get('trayicon_notification_on_events')
 
 def get_advanced_notification(event, account, contact):
-	'''Returns the number of the first (top most)
-	advanced notification else None'''
+	"""
+	Returns the number of the first (top most) advanced notification else None
+	"""
 	num = 0
 	notif = gajim.config.get_per('notifications', str(num))
 	while notif:
@@ -146,10 +151,11 @@ def get_advanced_notification(event, account, contact):
 		notif = gajim.config.get_per('notifications', str(num))
 
 def notify(event, jid, account, parameters, advanced_notif_num=None):
-	'''Check what type of notifications we want, depending on basic
-	and the advanced configuration of notifications and do these notifications;
-	advanced_notif_num holds the number of the first (top most) advanced
-	notification'''
+	"""
+	Check what type of notifications we want, depending on basic and the advanced
+	configuration of notifications and do these notifications; advanced_notif_num
+	holds the number of the first (top most) advanced notification
+	"""
 	# First, find what notifications we want
 	do_popup = False
 	do_sound = False
@@ -228,16 +234,16 @@ def notify(event, jid, account, parameters, advanced_notif_num=None):
 				show_image = 'online.png'
 				suffix = '_notif_size_colored'
 			transport_name = gajim.get_transport_name_from_jid(jid)
-			img = None
+			img_path = None
 			if transport_name:
-				img = os.path.join(helpers.get_transport_path(transport_name),
+				img_path = os.path.join(helpers.get_transport_path(transport_name),
 					'48x48', show_image)
-			if not img or not os.path.isfile(img):
+			if not img_path or not os.path.isfile(img_path):
 				iconset = gajim.config.get('iconset')
-				img = os.path.join(helpers.get_iconset_path(iconset), '48x48',
+				img_path = os.path.join(helpers.get_iconset_path(iconset), '48x48',
 					show_image)
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(img,
-				jid = jid, suffix = suffix)
+			path = gtkgui_helpers.get_path_to_generic_or_avatar(img_path, jid=jid,
+				suffix=suffix)
 			if event == 'status_change':
 				title = _('%(nick)s Changed Status') % \
 					{'nick': gajim.get_name_from_jid(account, jid)}
@@ -267,16 +273,14 @@ def notify(event, jid, account, parameters, advanced_notif_num=None):
 		elif event == 'new_message':
 			if message_type == 'normal': # single message
 				event_type = _('New Single Message')
-				img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-					'single_msg_recv.png')
+				img_name = 'gajim-single_msg_recv'
 				title = _('New Single Message from %(nickname)s') % \
 					{'nickname': nickname}
 				text = message
 			elif message_type == 'pm': # private message
 				event_type = _('New Private Message')
 				room_name = gajim.get_nick_from_jid(jid)
-				img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-					'priv_msg_recv.png')
+				img_name = 'gajim-priv_msg_recv'
 				title = _('New Private Message from group chat %s') % room_name
 				if message:
 					text = _('%(nickname)s: %(message)s') % {'nickname': nickname,
@@ -286,14 +290,13 @@ def notify(event, jid, account, parameters, advanced_notif_num=None):
 
 			else: # chat message
 				event_type = _('New Message')
-				img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-					'chat_msg_recv.png')
+				img_name = 'gajim-chat_msg_recv'
 				title = _('New Message from %(nickname)s') % \
 					{'nickname': nickname}
 				text = message
-			path = gtkgui_helpers.get_path_to_generic_or_avatar(img)
+			img_path = gtkgui_helpers.get_icon_path(img_name, 48)
 			popup(event_type, jid, account, message_type,
-				path_to_image=path, title=title, text=text)
+				path_to_image=img_path, title=title, text=text)
 
 	if do_sound:
 		snd_file = None
@@ -327,17 +330,16 @@ def notify(event, jid, account, parameters, advanced_notif_num=None):
 		except Exception:
 			pass
 
-def popup(event_type, jid, account, msg_type='', path_to_image=None,
-	title=None, text=None):
-	'''Notifies a user of an event. It first tries to a valid implementation of
+def popup(event_type, jid, account, msg_type='', path_to_image=None, title=None,
+		text=None):
+	"""
+	Notify a user of an event. It first tries to a valid implementation of
 	the Desktop Notification Specification. If that fails, then we fall back to
-	the older style PopupNotificationWindow method.'''
-
+	the older style PopupNotificationWindow method
+	"""
 	# default image
 	if not path_to_image:
-		path_to_image = os.path.abspath(
-			os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-				'chat_msg_recv.png')) # img to display
+		path_to_image = gtkgui_helpers.get_icon_path('gajim-chat_msg_recv', 48)
 
 	if gajim.HAVE_INDICATOR and event_type in (_('New Message'),
 	_('New Single Message'), _('New Private Message')):
@@ -414,9 +416,12 @@ def on_pynotify_notification_clicked(notification, action):
 	gajim.interface.handle_event(account, jid, msg_type)
 
 class NotificationResponseManager:
-	'''Collects references to pending DesktopNotifications and manages there
-	signalling. This is necessary due to a bug in DBus where you can't remove
-	a signal from an interface once it's connected.'''
+	"""
+	Collect references to pending DesktopNotifications and manages there
+	signalling. This is necessary due to a bug in DBus where you can't remove a
+	signal from an interface once it's connected
+	"""
+
 	def __init__(self):
 		self.pending = {}
 		self.received = []
@@ -464,8 +469,11 @@ class NotificationResponseManager:
 notification_response_manager = NotificationResponseManager()
 
 class DesktopNotification:
-	'''A DesktopNotification that interfaces with D-Bus via the Desktop
-	Notification specification'''
+	"""
+	A DesktopNotification that interfaces with D-Bus via the Desktop Notification
+	specification
+	"""
+
 	def __init__(self, event_type, jid, account, msg_type='',
 		path_to_image=None, title=None, text=None):
 		self.path_to_image = path_to_image
@@ -516,9 +524,8 @@ class DesktopNotification:
 			ntype = 'unsubscribed'
 		else:
 			# default failsafe values
-			self.path_to_image = os.path.abspath(
-				os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
-					'chat_msg_recv.png')) # img to display
+			self.path_to_image = gtkgui_helpers.get_icon_path(
+				'gajim-chat_msg_recv', 48)
 			ntype = 'im' # Notification Type
 
 		self.notif = dbus_support.get_notifications_interface(self)
@@ -541,8 +548,7 @@ class DesktopNotification:
 			notification_text = ('<html><img src="%(image)s" align=left />' \
 				'%(title)s<br/>%(text)s</html>') % {'title': self.title,
 				'text': self.text, 'image': self.path_to_image}
-			gajim_icon = os.path.abspath(os.path.join(gajim.DATA_DIR, 'pixmaps',
-				'gajim.png'))
+			gajim_icon = gtkgui_helpers.get_icon_path('gajim', 48)
 			self.notif.Notify(
 				dbus.String(_('Gajim')),			# app_name (string)
 				dbus.UInt32(0),						# replaces_id (uint)
@@ -584,9 +590,8 @@ class DesktopNotification:
 		if version > [0, 3]:
 			if gajim.interface.systray_enabled and \
 			gajim.config.get('attach_notifications_to_systray'):
-				x, y = gajim.interface.systray.img_tray.window.get_origin()
-				width, height, = \
-					gajim.interface.systray.img_tray.window.get_geometry()[2:4]
+				status_icon = gajim.interface.systray.status_icon
+				x, y, width, height = status_icon.get_geometry()[1]
 				pos_x = x + (width / 2)
 				pos_y = y + (height / 2)
 				hints = {'x': pos_x, 'y': pos_y}
diff --git a/src/profile_window.py b/src/profile_window.py
index a417ede08..c0705adc8 100644
--- a/src/profile_window.py
+++ b/src/profile_window.py
@@ -36,7 +36,9 @@ from common import gajim
 
 
 class ProfileWindow:
-	'''Class for our information window'''
+	"""
+	Class for our information window
+	"""
 
 	def __init__(self, account):
 		self.xml = gtkgui_helpers.get_glade('profile_window.glade')
@@ -68,7 +70,7 @@ class ProfileWindow:
 		return True # loop forever
 
 	def remove_statusbar(self, message_id):
-		self.statusbar.remove(self.context_id, message_id)
+		self.statusbar.remove_message(self.context_id, message_id)
 		self.remove_statusbar_timeout_id = None
 
 	def on_profile_window_destroy(self, widget):
@@ -173,20 +175,22 @@ class ProfileWindow:
 				on_response_cancel = on_cancel, on_response_clear = on_clear)
 
 	def on_PHOTO_button_press_event(self, widget, event):
-		'''If right-clicked, show popup'''
+		"""
+		If right-clicked, show popup
+		"""
 		if event.button == 3 and self.avatar_encoded: # right click
 			menu = gtk.Menu()
 
 			# Try to get pixbuf
 			pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.jid,
-				use_local = False)
+				use_local=False)
 
-			if pixbuf:
+			if pixbuf not in (None, 'ask'):
 				nick = gajim.config.get_per('accounts', self.account, 'name')
 				menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS)
 				menuitem.connect('activate',
 					gtkgui_helpers.on_avatar_save_as_menuitem_activate,
-					self.jid, None, nick + '.jpeg')
+					self.jid, self.account, nick)
 				menu.append(menuitem)
 			# show clear
 			menuitem = gtk.ImageMenuItem(gtk.STOCK_CLEAR)
@@ -246,7 +250,7 @@ class ProfileWindow:
 					self.set_value(i + '_entry', vcard_[i])
 		if self.update_progressbar_timeout_id is not None:
 			if self.message_id:
-				self.statusbar.remove(self.context_id, self.message_id)
+				self.statusbar.remove_message(self.context_id, self.message_id)
 			self.message_id = self.statusbar.push(self.context_id,
 				_('Information received'))
 			self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3,
@@ -257,7 +261,9 @@ class ProfileWindow:
 			self.update_progressbar_timeout_id = None
 
 	def add_to_vcard(self, vcard_, entry, txt):
-		'''Add an information to the vCard dictionary'''
+		"""
+		Add an information to the vCard dictionary
+		"""
 		entries = entry.split('_')
 		loc = vcard_
 		if len(entries) == 3: # We need to use lists
@@ -280,7 +286,9 @@ class ProfileWindow:
 		return vcard_
 
 	def make_vcard(self):
-		'''make the vCard dictionary'''
+		"""
+		Make the vCard dictionary
+		"""
 		entries = ['FN', 'NICKNAME', 'BDAY', 'EMAIL_HOME_USERID', 'URL',
 			'TEL_HOME_NUMBER', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE', 'N_PREFIX',
 			'N_SUFFIX', 'ADR_HOME_STREET', 'ADR_HOME_EXTADR', 'ADR_HOME_LOCALITY',
@@ -322,8 +330,7 @@ class ProfileWindow:
 		nick = ''
 		if 'NICKNAME' in vcard_:
 			nick = vcard_['NICKNAME']
-			from common import pep
-			pep.user_send_nickname(self.account, nick)
+			gajim.connections[self.account].send_nickname(nick)
 		if nick == '':
 			nick = gajim.config.get_per('accounts', self.account, 'name')
 		gajim.nicks[self.account] = nick
@@ -342,7 +349,7 @@ class ProfileWindow:
 
 	def vcard_not_published(self):
 		if self.message_id:
-			self.statusbar.remove(self.context_id, self.message_id)
+			self.statusbar.remove_message(self.context_id, self.message_id)
 		self.message_id = self.statusbar.push(self.context_id,
 			_('Information NOT published'))
 		self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3,
diff --git a/src/remote_control.py b/src/remote_control.py
index f50370708..377b9e1e8 100644
--- a/src/remote_control.py
+++ b/src/remote_control.py
@@ -29,6 +29,8 @@
 import gobject
 import gtk
 import os
+import base64
+import mimetypes
 
 from common import gajim
 from common import helpers
@@ -64,9 +66,10 @@ DBUS_DICT_SS = lambda : dbus.Dictionary({}, signature="ss")
 DBUS_NONE = lambda : dbus.Int32(0)
 
 def get_dbus_struct(obj):
-	''' recursively go through all the items and replace
-	them with their casted dbus equivalents
-	'''
+	"""
+	Recursively go through all the items and replace them with their casted dbus
+	equivalents
+	"""
 	if obj is None:
 		return DBUS_NONE()
 	if isinstance(obj, (unicode, str)):
@@ -110,8 +113,12 @@ class Remote:
 
 
 class SignalObject(dbus.service.Object):
-	''' Local object definition for /org/gajim/dbus/RemoteObject.
-	(This docstring is not be visible, because the clients can access only the remote object.)'''
+	"""
+	Local object definition for /org/gajim/dbus/RemoteObject
+
+	This docstring is not be visible, because the clients can access only the
+	remote object.
+	"""
 
 	def __init__(self, bus_name):
 		self.first_show = True
@@ -193,14 +200,18 @@ class SignalObject(dbus.service.Object):
 		pass
 
 	def raise_signal(self, signal, arg):
-		'''raise a signal, with a single argument of unspecified type
-		Instead of obj.raise_signal("Foo", bar), use obj.Foo(bar).'''
+		"""
+		Raise a signal, with a single argument of unspecified type Instead of
+		obj.raise_signal("Foo", bar), use obj.Foo(bar)
+		"""
 		getattr(self, signal)(arg)
 
 	@dbus.service.method(INTERFACE, in_signature='s', out_signature='s')
 	def get_status(self, account):
-		'''Returns status (show to be exact) which is the global one
-		unless account is given'''
+		"""
+		Return status (show to be exact) which is the global one unless account is
+		given
+		"""
 		if not account:
 			# If user did not ask for account, returns the global status
 			return DBUS_STRING(helpers.get_global_show())
@@ -210,8 +221,9 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='s', out_signature='s')
 	def get_status_message(self, account):
-		'''Returns status which is the global one
-		unless account is given'''
+		"""
+		Return status which is the global one unless account is given
+		"""
 		if not account:
 			# If user did not ask for account, returns the global status
 			return DBUS_STRING(str(helpers.get_global_status()))
@@ -220,7 +232,9 @@ class SignalObject(dbus.service.Object):
 		return DBUS_STRING(status)
 
 	def _get_account_and_contact(self, account, jid):
-		'''get the account (if not given) and contact instance from jid'''
+		"""
+		Get the account (if not given) and contact instance from jid
+		"""
 		connected_account = None
 		contact = None
 		accounts = gajim.contacts.get_accounts()
@@ -247,8 +261,10 @@ class SignalObject(dbus.service.Object):
 		return connected_account, contact
 
 	def _get_account_for_groupchat(self, account, room_jid):
-		'''get the account which is connected to groupchat (if not given)
-		or check if the given account is connected to the groupchat'''
+		"""
+		Get the account which is connected to groupchat (if not given)
+		or check if the given account is connected to the groupchat
+		"""
 		connected_account = None
 		accounts = gajim.contacts.get_accounts()
 		# if there is only one account in roster, take it as default
@@ -273,8 +289,10 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='sss', out_signature='b')
 	def send_file(self, file_path, jid, account):
-		'''send file, located at 'file_path' to 'jid', using account
-		(optional) 'account' '''
+		"""
+		Send file, located at 'file_path' to 'jid', using account (optional)
+		'account'
+		"""
 		jid = self._get_real_jid(jid, account)
 		connected_account, contact = self._get_account_and_contact(account, jid)
 
@@ -289,8 +307,10 @@ class SignalObject(dbus.service.Object):
 
 	def _send_message(self, jid, message, keyID, account, type_ = 'chat',
 	subject = None):
-		'''can be called from send_chat_message (default when send_message)
-		or send_single_message'''
+		"""
+		Can be called from send_chat_message (default when send_message) or
+		send_single_message
+		"""
 		if not jid or not message:
 			return DBUS_BOOLEAN(False)
 		if not keyID:
@@ -305,22 +325,27 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='ssss', out_signature='b')
 	def send_chat_message(self, jid, message, keyID, account):
-		'''Send chat 'message' to 'jid', using account (optional) 'account'.
-		if keyID is specified, encrypt the message with the pgp key '''
+		"""
+		Send chat 'message' to 'jid', using account (optional) 'account'. If keyID
+		is specified, encrypt the message with the pgp key
+		"""
 		jid = self._get_real_jid(jid, account)
 		return self._send_message(jid, message, keyID, account)
 
 	@dbus.service.method(INTERFACE, in_signature='sssss', out_signature='b')
 	def send_single_message(self, jid, subject, message, keyID, account):
-		'''Send single 'message' to 'jid', using account (optional) 'account'.
-		if keyID is specified, encrypt the message with the pgp key '''
+		"""
+		Send single 'message' to 'jid', using account (optional) 'account'. If
+		keyID is specified, encrypt the message with the pgp key
+		"""
 		jid = self._get_real_jid(jid, account)
 		return self._send_message(jid, message, keyID, account, type, subject)
 
 	@dbus.service.method(INTERFACE, in_signature='sss', out_signature='b')
 	def send_groupchat_message(self, room_jid, message, account):
-		'''Send 'message' to groupchat 'room_jid',
-		using account (optional) 'account'.'''
+		"""
+		Send 'message' to groupchat 'room_jid', using account (optional) 'account'
+		"""
 		if not room_jid or not message:
 			return DBUS_BOOLEAN(False)
 		connected_account = self._get_account_for_groupchat(account, room_jid)
@@ -332,8 +357,10 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='sss', out_signature='b')
 	def open_chat(self, jid, account, message):
-		'''Shows the tabbed window for new message to 'jid', using account
-		(optional) 'account' '''
+		"""
+		Shows the tabbed window for new message to 'jid', using account (optional)
+		'account'
+		"""
 		if not jid:
 			raise dbus_support.MissingArgument()
 		jid = self._get_real_jid(jid, account)
@@ -384,12 +411,18 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='sss', out_signature='b')
 	def change_status(self, status, message, account):
-		''' change_status(status, message, account). account is optional -
-		if not specified status is changed for all accounts. '''
+		"""
+		change_status(status, message, account). Account is optional - if not
+		specified status is changed for all accounts
+		"""
 		if status not in ('offline', 'online', 'chat',
-			'away', 'xa', 'dnd', 'invisible'):
-			return DBUS_BOOLEAN(False)
+		'away', 'xa', 'dnd', 'invisible'):
+			status = ''
 		if account:
+			if not status:
+				if account not in gajim.connections:
+					return DBUS_BOOLEAN(False)
+				status = gajim.SHOW_LIST[gajim.connections[account].connected]
 			gobject.idle_add(gajim.interface.roster.send_status, account,
 				status, message)
 		else:
@@ -398,15 +431,22 @@ class SignalObject(dbus.service.Object):
 				if not gajim.config.get_per('accounts', acc,
 				'sync_with_global_status'):
 					continue
+				if status:
+					status_ = status
+				else:
+					if acc not in gajim.connections:
+						continue
+					status_ = gajim.SHOW_LIST[gajim.connections[acc].connected]
 				gobject.idle_add(gajim.interface.roster.send_status, acc,
-					status, message)
+					status_, message)
 		return DBUS_BOOLEAN(False)
 
 	@dbus.service.method(INTERFACE, in_signature='ss', out_signature='')
 	def set_priority(self, prio, account):
-		''' set_priority(prio, account). account is optional -
-		if not specified priority is changed for all accounts. that are synced
-		with global status'''
+		"""
+		set_priority(prio, account). Account is optional - if not specified
+		priority is changed for all accounts. That are synced with global status
+		"""
 		if account:
 			gajim.config.set_per('accounts', account, 'priority', prio)
 			show = gajim.SHOW_LIST[gajim.connections[account].connected]
@@ -429,14 +469,17 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='', out_signature='')
 	def show_next_pending_event(self):
-		'''Show the window(s) with next pending event in tabbed/group chats.'''
+		"""
+		Show the window(s) with next pending event in tabbed/group chats
+		"""
 		if gajim.events.get_nb_events():
 			gajim.interface.systray.handle_first_event()
 
 	@dbus.service.method(INTERFACE, in_signature='s', out_signature='a{sv}')
 	def contact_info(self, jid):
-		'''get vcard info for a contact. Return cached value of the vcard.
-		'''
+		"""
+		Get vcard info for a contact. Return cached value of the vcard
+		"""
 		if not isinstance(jid, unicode):
 			jid = unicode(jid)
 		if not jid:
@@ -452,7 +495,9 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='', out_signature='as')
 	def list_accounts(self):
-		'''list register accounts'''
+		"""
+		List register accounts
+		"""
 		result = gajim.contacts.get_accounts()
 		result_array = dbus.Array([], signature='s')
 		if result and len(result) > 0:
@@ -462,7 +507,9 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='s', out_signature='a{ss}')
 	def account_info(self, account):
-		'''show info on account: resource, jid, nick, prio, message'''
+		"""
+		Show info on account: resource, jid, nick, prio, message
+		"""
 		result = DBUS_DICT_SS()
 		if account in gajim.connections:
 			# account is valid
@@ -479,8 +526,10 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='s', out_signature='aa{sv}')
 	def list_contacts(self, account):
-		'''list all contacts in the roster. If the first argument is specified,
-		then return the contacts for the specified account'''
+		"""
+		List all contacts in the roster. If the first argument is specified, then
+		return the contacts for the specified account
+		"""
 		result = dbus.Array([], signature='aa{sv}')
 		accounts = gajim.contacts.get_accounts()
 		if len(accounts) == 0:
@@ -500,7 +549,9 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='', out_signature='')
 	def toggle_roster_appearance(self):
-		''' shows/hides the roster window '''
+		"""
+		Show/hide the roster window
+		"""
 		win = gajim.interface.roster.window
 		if win.get_property('visible'):
 			gobject.idle_add(win.hide)
@@ -514,7 +565,9 @@ class SignalObject(dbus.service.Object):
 
 	@dbus.service.method(INTERFACE, in_signature='', out_signature='')
 	def toggle_ipython(self):
-		''' shows/hides the ipython window '''
+		"""
+		Show/hide the ipython window
+		"""
 		win = gajim.ipython_window
 		if win:
 			if win.window.is_visible():
@@ -615,9 +668,10 @@ class SignalObject(dbus.service.Object):
 		return False
 
 	def _get_real_jid(self, jid, account = None):
-		'''get the real jid from the given one: removes xmpp: or get jid from nick
-		if account is specified, search only in this account
-		'''
+		"""
+		Get the real jid from the given one: removes xmpp: or get jid from nick if
+		account is specified, search only in this account
+		"""
 		if account:
 			accounts = [account]
 		else:
@@ -643,7 +697,9 @@ class SignalObject(dbus.service.Object):
 		return jid
 
 	def _contacts_as_dbus_structure(self, contacts):
-		''' get info from list of Contact objects and create dbus dict '''
+		"""
+		Get info from list of Contact objects and create dbus dict
+		"""
 		if not contacts:
 			return None
 		prim_contact = None # primary contact
@@ -692,6 +748,31 @@ class SignalObject(dbus.service.Object):
 			for acc in gajim.contacts.get_accounts():
 				gajim.connections[acc].send_stanza(str(xml))
 
+	@dbus.service.method(INTERFACE, in_signature='ss', out_signature='')
+	def change_avatar(self, picture, account):
+		filesize = os.path.getsize(picture)
+		invalid_file = False
+		if os.path.isfile(picture):
+			stat = os.stat(picture)
+			if stat[6] == 0:
+				invalid_file = True
+		else:
+			invalid_file = True
+		if not invalid_file and filesize < 16384:
+			fd = open(picture, 'rb')
+			data = fd.read()
+			avatar = base64.encodestring(data)
+			avatar_mime_type = mimetypes.guess_type(picture)[0]
+			vcard={}
+			vcard['PHOTO'] = {'BINVAL': avatar}
+			if avatar_mime_type:
+				vcard['PHOTO']['TYPE'] = avatar_mime_type
+			if account:
+				gajim.connections[account].send_vcard(vcard)
+			else:
+				for acc in gajim.connections:
+					gajim.connections[acc].send_vcard(vcard)
+
 	@dbus.service.method(INTERFACE, in_signature='ssss', out_signature='')
 	def join_room(self, room_jid, nick, password, account):
 		if not account:
diff --git a/src/roster_window.py b/src/roster_window.py
index fa580c7bb..a02fe588b 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -38,6 +38,7 @@ import gobject
 import os
 import sys
 import time
+import locale
 
 import common.sleepy
 import history_window
@@ -60,6 +61,7 @@ from common import helpers
 from common.exceptions import GajimGeneralException
 from common import i18n
 from common import pep
+from common import location_listener
 
 from message_window import MessageWindowMgr
 
@@ -72,30 +74,32 @@ from common.pep import MOODS, ACTIVITIES
 
 #(icon, name, type, jid, account, editable, second pixbuf)
 (
-C_IMG, # image to show state (online, new message etc)
-C_NAME, # cellrenderer text that holds contact nickame
-C_TYPE, # account, group or contact?
-C_JID, # the jid of the row
-C_ACCOUNT, # cellrenderer text that holds account name
-C_MOOD_PIXBUF,
-C_ACTIVITY_PIXBUF,
-C_TUNE_PIXBUF,
-C_AVATAR_PIXBUF, # avatar_pixbuf
-C_PADLOCK_PIXBUF, # use for account row only
-) = range(10)
+	C_IMG, # image to show state (online, new message etc)
+	C_NAME, # cellrenderer text that holds contact nickame
+	C_TYPE, # account, group or contact?
+	C_JID, # the jid of the row
+	C_ACCOUNT, # cellrenderer text that holds account name
+	C_MOOD_PIXBUF,
+	C_ACTIVITY_PIXBUF,
+	C_TUNE_PIXBUF,
+	C_LOCATION_PIXBUF,
+	C_AVATAR_PIXBUF, # avatar_pixbuf
+	C_PADLOCK_PIXBUF, # use for account row only
+) = range(11)
 
 class RosterWindow:
-	'''Class for main window of the GTK+ interface'''
+	"""
+	Class for main window of the GTK+ interface
+	"""
 
 	def _get_account_iter(self, name, model=None):
-		'''
-		Return the gtk.TreeIter of the given account or None
-		if not found.
+		"""
+		Return the gtk.TreeIter of the given account or None if not found
 
 		Keyword arguments:
 		name -- the account name
 		model -- the data model (default TreeFilterModel)
-		'''
+		"""
 		if not model:
 			model = self.modelfilter
 		if model is None:
@@ -112,16 +116,15 @@ class RosterWindow:
 
 
 	def _get_group_iter(self, name, account, account_iter=None, model=None):
-		'''
-		Return the gtk.TreeIter of the given group or None if not found.
+		"""
+		Return the gtk.TreeIter of the given group or None if not found
 
 		Keyword arguments:
 		name -- the group name
 		account -- the account name
 		account_iter -- the iter of the account the model (default None)
 		model -- the data model (default TreeFilterModel)
-
-		'''
+		"""
 		if not model:
 			model = self.modelfilter
 		if not account_iter:
@@ -137,14 +140,13 @@ class RosterWindow:
 
 
 	def _get_self_contact_iter(self, account, model=None):
-		''' Return the gtk.TreeIter of SelfContact or None if not found.
+		"""
+		Return the gtk.TreeIter of SelfContact or None if not found
 
 		Keyword arguments:
 		account -- the account of SelfContact
 		model -- the data model (default TreeFilterModel)
-
-		'''
-
+		"""
 		if not model:
 			model = self.modelfilter
 		iterAcct = self._get_account_iter(account, model)
@@ -162,15 +164,15 @@ class RosterWindow:
 
 
 	def _get_contact_iter(self, jid, account, contact=None, model=None):
-		''' Return a list of gtk.TreeIter of the given contact.
+		"""
+		Return a list of gtk.TreeIter of the given contact
 
 		Keyword arguments:
 		jid -- the jid without resource
 		account -- the account
 		contact -- the contact (default None)
 		model -- the data model (default TreeFilterModel)
-
-		'''
+		"""
 		if not model:
 			model = self.modelfilter
 			# when closing Gajim model can be none (async pbs?)
@@ -228,23 +230,25 @@ class RosterWindow:
 
 
 	def _iter_is_separator(self, model, titer):
-		''' Return True if the given iter is a separator.
+		"""
+		Return True if the given iter is a separator
 
 		Keyword arguments:
 		model -- the data model
 		iter -- the gtk.TreeIter to test
-		'''
+		"""
 		if model[titer][0] == 'SEPARATOR':
 			return True
 		return False
 
 
 	def _iter_contact_rows(self, model=None):
-		'''Iterate over all contact rows in given model.
+		"""
+		Iterate over all contact rows in given model
 
 		Keyword argument
 		model -- the data model (default TreeFilterModel)
-		'''
+		"""
 		if not model:
 			model = self.modelfilter
 		account_iter = model.get_iter_root()
@@ -265,10 +269,9 @@ class RosterWindow:
 #############################################################################
 
 	def add_account(self, account):
-		'''
-		Add account to roster and draw it. Do nothing if it is
-		already in.
-		'''
+		"""
+		Add account to roster and draw it. Do nothing if it is already in
+		"""
 		if self._get_account_iter(account):
 			# Will happen on reconnect or for merged accounts
 			return
@@ -279,7 +282,7 @@ class RosterWindow:
 			self.model.append(None, [
 				gajim.interface.jabber_state_images['16'][show],
 				_('Merged accounts'), 'account', '', 'all',
-				None, None, None, None, None])
+				None, None, None, None, None, None])
 		else:
 			show = gajim.SHOW_LIST[gajim.connections[account].connected]
 			our_jid = gajim.get_jid_from_account(account)
@@ -294,23 +297,23 @@ class RosterWindow:
 			self.model.append(None, [
 				gajim.interface.jabber_state_images['16'][show],
 				gobject.markup_escape_text(account), 'account',
-				our_jid, account, None, None, None, None,
+				our_jid, account, None, None, None, None, None,
 				tls_pixbuf])
 
 		self.draw_account(account)
 
 
 	def add_account_contacts(self, account):
-		'''Add all contacts and groups of the given account to roster,
-		draw them and account.
-		'''
+		"""
+		Add all contacts and groups of the given account to roster, draw them and
+		account
+		"""
 		self.starting = True
 		jids = gajim.contacts.get_jid_list(account)
 
 		self.tree.freeze_child_notify()
 		for jid in jids:
 			self.add_contact(jid, account)
-		self.tree.thaw_child_notify()
 
 		# Do not freeze the GUI when drawing the contacts
 		if jids:
@@ -321,15 +324,18 @@ class RosterWindow:
 		for group in gajim.groups[account]:
 			self.draw_group(group, account)
 		self.draw_account(account)
+
+		self.tree.thaw_child_notify()
 		self.starting = False
 
 
 	def _add_entity(self, contact, account, groups=None,
-	big_brother_contact=None, big_brother_account=None):
-		'''Add the given contact to roster data model.
+			big_brother_contact=None, big_brother_account=None):
+		"""
+		Add the given contact to roster data model
 
-		Contact is added regardless if he is already in roster or not.
-		Return list of newly added iters.
+		Contact is added regardless if he is already in roster or not. Return
+		list of newly added iters.
 
 		Keyword arguments:
 		contact -- the contact to add
@@ -339,7 +345,7 @@ class RosterWindow:
 			Parameter ignored when big_brother_contact is specified.
 		big_brother_contact -- if specified contact is added as child
 			  big_brother_contact. (default None)
-		'''
+		"""
 		added_iters = []
 		if big_brother_contact:
 			# Add contact under big brother
@@ -354,7 +360,8 @@ class RosterWindow:
 
 			for child_iter in parent_iters:
 				it = self.model.append(child_iter, (None,	contact.get_shown_name(),
-				'contact', contact.jid, account, None, None, None, None, None))
+				'contact', contact.jid, account, None, None, None, None, None,
+				None))
 				added_iters.append(it)
 		else:
 			# We are a normal contact. Add us to our groups.
@@ -369,7 +376,7 @@ class RosterWindow:
 					child_iterG = self.model.append(child_iterA,
 						[gajim.interface.jabber_state_images['16']['closed'],
 						gobject.markup_escape_text(group),
-						'group', group, account, None, None, None, None, None])
+						'group', group, account, None, None, None, None, None, None])
 					self.draw_group(group, account)
 
 				if contact.is_transport():
@@ -384,7 +391,7 @@ class RosterWindow:
 				i_ = self.model.append(child_iterG, (None,
 					contact.get_shown_name(), typestr,
 					contact.jid, account, None, None, None,
-					None, None))
+					None, None, None))
 				added_iters.append(i_)
 
 				# Restore the group expand state
@@ -399,7 +406,8 @@ class RosterWindow:
 		return added_iters
 
 	def _remove_entity(self, contact, account, groups=None):
-		'''Remove the given contact from roster data model.
+		"""
+		Remove the given contact from roster data model
 
 		Empty groups after contact removal are removed too.
 		Return False if contact still has children and deletion was
@@ -410,7 +418,7 @@ class RosterWindow:
 		contact -- the contact to add
 		account -- the contacts account
 		groups -- list of groups to remove the contact from.
-		'''
+		"""
 		iters = self._get_contact_iter(contact.jid, account, contact, self.model)
 		assert iters, '%s shall be removed but is not in roster' % contact.jid
 
@@ -450,8 +458,8 @@ class RosterWindow:
 			return True
 
 	def _add_metacontact_family(self, family, account):
-		'''
-		Add the give Metacontact family to roster data model.
+		"""
+		Add the give Metacontact family to roster data model
 
 		Add Big Brother to his groups and all others under him.
 		Return list of all added (contact, account) tuples with
@@ -459,7 +467,7 @@ class RosterWindow:
 
 		Keyword arguments:
 		family -- the family, see Contacts.get_metacontacts_family()
-		'''
+		"""
 
 		nearby_family, big_brother_jid, big_brother_account = \
 			self._get_nearby_family_and_big_brother(family, account)
@@ -497,12 +505,12 @@ class RosterWindow:
 		return brothers
 
 	def _remove_metacontact_family(self, family, account):
-		'''
-		Remove the given Metacontact family from roster data model.
+		"""
+		Remove the given Metacontact family from roster data model
 
 		See Contacts.get_metacontacts_family() and
 		RosterWindow._remove_entity()
-		'''
+		"""
 		nearby_family = self._get_nearby_family_and_big_brother(
 			family, account)[0]
 
@@ -561,7 +569,9 @@ class RosterWindow:
 
 
 	def _recalibrate_metacontact_family(self, family, account):
-		'''Regroup metacontact family if necessary.'''
+		"""
+		Regroup metacontact family if necessary
+		"""
 
 		brothers = []
 		nearby_family, big_brother_jid, big_brother_account = \
@@ -609,10 +619,11 @@ class RosterWindow:
 		return gajim.contacts.get_nearby_family_and_big_brother(family, account)
 
 	def _add_self_contact(self, account):
-		'''Add account's SelfContact to roster and draw it and the account.
+		"""
+		Add account's SelfContact to roster and draw it and the account
 
 		Return the SelfContact contact instance
-		'''
+		"""
 		jid = gajim.get_jid_from_account(account)
 		contact = gajim.contacts.get_first_contact_from_jid(account, jid)
 
@@ -622,7 +633,7 @@ class RosterWindow:
 		child_iterA = self._get_account_iter(account, self.model)
 		self.model.append(child_iterA, (None, gajim.nicks[account],
 			'self_contact', jid, account, None, None, None, None,
-			None))
+			None, None))
 
 		self.draw_completely(jid, account)
 		self.draw_account(account)
@@ -634,7 +645,8 @@ class RosterWindow:
 			self._recalibrate_metacontact_family(family, account)
 
 	def add_contact(self, jid, account):
-		'''Add contact to roster and draw him.
+		"""
+		Add contact to roster and draw him
 
 		Add contact to all its group and redraw the groups, the contact and the
 		account. If it's a Metacontact, add and draw the whole family.
@@ -646,8 +658,7 @@ class RosterWindow:
 		Keyword arguments:
 		jid -- the contact's jid or SelfJid to add SelfContact
 		account -- the corresponding account.
-
-		'''
+		"""
 		contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
 		if len(self._get_contact_iter(jid, account, contact, self.model)):
 			# If contact already in roster, do nothing
@@ -695,7 +706,8 @@ class RosterWindow:
 		return contacts[0][0] # it's contact/big brother with highest priority
 
 	def remove_contact(self, jid, account, force=False, backend=False):
-		'''Remove contact from roster.
+		"""
+		Remove contact from roster
 
 		Remove contact from all its group. Remove empty groups or redraw
 		otherwise.
@@ -708,8 +720,7 @@ class RosterWindow:
 		account -- the corresponding account.
 		force -- remove contact even it has pending evens (Default False)
 		backend -- also remove contact instance (Default False)
-
-		'''
+		"""
 		contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
 		if not contact:
 			return
@@ -761,13 +772,14 @@ class RosterWindow:
 		return True
 
 	def rename_self_contact(self, old_jid, new_jid, account):
-		'''Rename the self_contact jid
+		"""
+		Rename the self_contact jid
 
 		Keyword arguments:
 		old_jid -- our old jid
 		new_jid -- our new jid
 		account -- the corresponding account.
-		'''
+		"""
 		gajim.contacts.change_contact_jid(old_jid, new_jid, account)
 		self_iter = self._get_self_contact_iter(account, model=self.model)
 		if not self_iter:
@@ -776,9 +788,9 @@ class RosterWindow:
 		self.draw_contact(new_jid, account)
 
 	def add_groupchat(self, jid, account, status=''):
-		'''Add groupchat to roster and draw it.
-		Return the added contact instance.
-		'''
+		"""
+		Add groupchat to roster and draw it. Return the added contact instance
+		"""
 		contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
 		# Do not show gc if we are disconnected and minimize it
 		if gajim.account_is_connected(account):
@@ -817,7 +829,9 @@ class RosterWindow:
 
 
 	def remove_groupchat(self, jid, account):
-		'''Remove groupchat from roster and redraw account and group.'''
+		"""
+		Remove groupchat from roster and redraw account and group
+		"""
 		contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
 		if contact.is_groupchat():
 			if jid in gajim.interface.minimized_controls[account]:
@@ -830,8 +844,9 @@ class RosterWindow:
 
 	# FIXME: This function is yet unused! Port to new API
 	def add_transport(self, jid, account):
-		'''Add transport to roster and draw it.
-		Return the added contact instance.'''
+		"""
+		Add transport to roster and draw it. Return the added contact instance
+		"""
 		contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
 		if contact is None:
 			#TRANSP
@@ -843,57 +858,60 @@ class RosterWindow:
 		return contact
 
 	def remove_transport(self, jid, account):
-		'''Remove transport from roster and redraw account and group.'''
+		"""
+		Remove transport from roster and redraw account and group
+		"""
 		self.remove_contact(jid, account, force=True, backend=True)
 		return True
-		
+
 	def rename_group(self, old_name, new_name, account):
 		"""
-		rename a roster group
+		Rename a roster group
 		"""
 		if old_name == new_name:
 			return
-		
+
 		# Groups may not change name from or to a special groups
 		for g in helpers.special_groups:
 			if g in (new_name, old_name):
 				return
-		
+
 		# update all contacts in the given group
 		if self.regroup:
 			accounts = gajim.connections.keys()
 		else:
 			accounts = [account,]
-		
+
 		for acc in accounts:
 			changed_contacts = []
 			for jid in gajim.contacts.get_jid_list(acc):
 				contact = gajim.contacts.get_first_contact_from_jid(acc, jid)
 				if old_name not in contact.groups:
 					continue
-				
+
 				self.remove_contact(jid, acc, force=True)
-				
+
 				contact.groups.remove(old_name)
 				if new_name not in contact.groups:
 					contact.groups.append(new_name)
-			
-				changed_contacts.append({'jid':jid, 'name':contact.name, 
+
+				changed_contacts.append({'jid':jid, 'name':contact.name,
 					'groups':contact.groups})
-			
-			gajim.connections[acc].update_contacts(changed_contacts)				
-			
+
+			gajim.connections[acc].update_contacts(changed_contacts)
+
 			for c in changed_contacts:
 				self.add_contact(c['jid'], acc)
-				
+
 			self._adjust_group_expand_collapse_state(new_name, acc)
-			
+
 			self.draw_group(old_name, acc)
 			self.draw_group(new_name, acc)
-					
+
 
 	def add_contact_to_groups(self, jid, account, groups, update=True):
-		'''Add contact to given groups and redraw them.
+		"""
+		Add contact to given groups and redraw them
 
 		Contact on server is updated too. When the contact has a family,
 		the action will be performed for all members.
@@ -903,8 +921,7 @@ class RosterWindow:
 		account -- the corresponding account
 		groups -- list of Groups to add the contact to.
 		update -- update contact on the server
-
-		'''
+		"""
 		self.remove_contact(jid, account, force=True)
 		for contact in gajim.contacts.get_contacts(account, jid):
 			for group in groups:
@@ -921,7 +938,8 @@ class RosterWindow:
 			self._adjust_group_expand_collapse_state(group, account)
 
 	def remove_contact_from_groups(self, jid, account, groups, update=True):
-		'''Remove contact from given groups and redraw them.
+		"""
+		Remove contact from given groups and redraw them
 
 		Contact on server is updated too. When the contact has a family,
 		the action will be performed for all members.
@@ -931,8 +949,7 @@ class RosterWindow:
 		account -- the corresponding account
 		groups -- list of Groups to remove the contact from
 		update -- update contact on the server
-
-		'''
+		"""
 		self.remove_contact(jid, account, force=True)
 		for contact in gajim.contacts.get_contacts(account, jid):
 			for group in groups:
@@ -969,7 +986,7 @@ class RosterWindow:
 				self._recalibrate_metacontact_family(family, account)
 			self.draw_contact(jid, account)
 
-	#FIXME: integrate into add_contact()
+	# FIXME: integrate into add_contact()
 	def add_to_not_in_the_roster(self, account, jid, nick='', resource=''):
 		keyID = ''
 		attached_keys = gajim.config.get_per('accounts', account,
@@ -1024,55 +1041,26 @@ class RosterWindow:
 
 		self.model[child_iter][C_NAME] = account_name
 
-		if gajim.config.get('show_mood_in_roster') \
-		and 'mood' in gajim.connections[account].mood \
-		and gajim.connections[account].mood['mood'].strip() in MOODS:
-
-			self.model[child_iter][C_MOOD_PIXBUF] = gtkgui_helpers.load_mood_icon(
-				gajim.connections[account].mood['mood'].strip()).get_pixbuf()
-
-		elif gajim.config.get('show_mood_in_roster') \
-		and 'mood' in gajim.connections[account].mood:
-			self.model[child_iter][C_MOOD_PIXBUF] = \
-				gtkgui_helpers.load_mood_icon('unknown'). \
-				get_pixbuf()
+		pep = gajim.connections[account].pep
+		if gajim.config.get('show_mood_in_roster') and 'mood' in pep:
+			self.model[child_iter][C_MOOD_PIXBUF] = pep['mood'].asPixbufIcon()
 		else:
 			self.model[child_iter][C_MOOD_PIXBUF] = None
 
-		if gajim.config.get('show_activity_in_roster') \
-		and 'activity' in gajim.connections[account].activity \
-		and gajim.connections[account].activity['activity'].strip() \
-		in ACTIVITIES:
-			if 'subactivity' in gajim.connections[account].activity \
-			and gajim.connections[account].activity['subactivity'].strip() \
-			in ACTIVITIES[gajim.connections[account].activity['activity'].strip()]:
-				self.model[child_iter][C_ACTIVITY_PIXBUF] = \
-					gtkgui_helpers.load_activity_icon(
-					gajim.connections[account].activity['activity'].strip(),
-					gajim.connections[account].activity['subactivity'].strip()). \
-					get_pixbuf()
-			else:
-				self.model[child_iter][C_ACTIVITY_PIXBUF] = \
-					gtkgui_helpers.load_activity_icon(
-					gajim.connections[account].activity['activity'].strip()). \
-					get_pixbuf()
-		elif gajim.config.get('show_activity_in_roster') \
-		and 'activity' in gajim.connections[account].activity:
-			self.model[child_iter][C_ACTIVITY_PIXBUF] = \
-				gtkgui_helpers.load_activity_icon('unknown'). \
-				get_pixbuf()
+		if gajim.config.get('show_activity_in_roster') and 'activity' in pep:
+			self.model[child_iter][C_ACTIVITY_PIXBUF] = pep['activity'].asPixbufIcon()
 		else:
 			self.model[child_iter][C_ACTIVITY_PIXBUF] = None
 
-		if gajim.config.get('show_tunes_in_roster') \
-		and ('artist' in gajim.connections[account].tune \
-		or 'title' in gajim.connections[account].tune):
-			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
-			self.model[child_iter][C_TUNE_PIXBUF] = \
-				gtk.gdk.pixbuf_new_from_file(path)
+		if gajim.config.get('show_tunes_in_roster') and 'tune' in pep:
+			self.model[child_iter][C_TUNE_PIXBUF] = pep['tune'].asPixbufIcon()
 		else:
 			self.model[child_iter][C_TUNE_PIXBUF] = None
 
+		if gajim.config.get('show_location_in_roster') and 'location' in pep:
+			self.model[child_iter][C_LOCATION_PIXBUF] = pep['location'].asPixbufIcon()
+		else:
+			self.model[child_iter][C_LOCATION_PIXBUF] = None
 		return False
 
 	def draw_group(self, group, account):
@@ -1110,7 +1098,9 @@ class RosterWindow:
 		return False
 
 	def draw_contact(self, jid, account, selected=False, focus=False):
-		'''draw the correct state image, name BUT not avatar'''
+		"""
+		Draw the correct state image, name BUT not avatar
+		"""
 		# focus is about if the roster window has toplevel-focus or not
 		# FIXME: We really need a custom cell_renderer
 
@@ -1278,80 +1268,48 @@ class RosterWindow:
 
 		return False
 
-
-	def draw_mood(self, jid, account):
-		iters = self._get_contact_iter(jid, account, model=self.model)
-		if not iters or not gajim.config.get('show_mood_in_roster'):
-			return
-		jid = self.model[iters[0]][C_JID]
-		jid = jid.decode('utf-8')
-		contact = gajim.contacts.get_contact(account, jid)
-		if 'mood' in contact.mood and contact.mood['mood'].strip() in MOODS:
-			pixbuf = gtkgui_helpers.load_mood_icon(
-				contact.mood['mood'].strip()).get_pixbuf()
-		elif 'mood' in contact.mood:
-			pixbuf = gtkgui_helpers.load_mood_icon(
-				'unknown').get_pixbuf()
+	def _is_pep_shown_in_roster(self, pep_type):
+		if pep_type == 'mood':
+			return gajim.config.get('show_mood_in_roster')
+		elif pep_type == 'activity':
+			return gajim.config.get('show_activity_in_roster')
+		elif pep_type == 'tune':
+			return  gajim.config.get('show_tunes_in_roster')
+		elif pep_type == 'location':
+			return  gajim.config.get('show_location_in_roster')
 		else:
-			pixbuf = None
-		for child_iter in iters:
-			self.model[child_iter][C_MOOD_PIXBUF] = pixbuf
-		return False
+			return False
 
+	def draw_all_pep_types(self, jid, account):
+		for pep_type in self._pep_type_to_model_column:
+			self.draw_pep(jid, account, pep_type)
 
-	def draw_activity(self, jid, account):
-		iters = self._get_contact_iter(jid, account, model=self.model)
-		if not iters or not gajim.config.get('show_activity_in_roster'):
+	def draw_pep(self, jid, account, pep_type):
+		if pep_type not in self._pep_type_to_model_column:
+			return
+		if not self._is_pep_shown_in_roster(pep_type):
 			return
-		jid = self.model[iters[0]][C_JID]
-		jid = jid.decode('utf-8')
-		contact = gajim.contacts.get_contact(account, jid)
-		if 'activity' in contact.activity \
-		and contact.activity['activity'].strip() in ACTIVITIES:
-			if 'subactivity' in contact.activity \
-			and contact.activity['subactivity'].strip() in \
-			ACTIVITIES[contact.activity['activity'].strip()]:
-				pixbuf = gtkgui_helpers.load_activity_icon(
-					contact.activity['activity'].strip(),
-					contact.activity['subactivity'].strip()).get_pixbuf()
-			else:
-				pixbuf = gtkgui_helpers.load_activity_icon(
-					contact.activity['activity'].strip()).get_pixbuf()
-		elif 'activity' in contact.activity:
-			pixbuf = gtkgui_helpers.load_activity_icon(
-				'unknown').get_pixbuf()
-		else:
-			pixbuf = None
-		for child_iter in iters:
-			self.model[child_iter][C_ACTIVITY_PIXBUF] = pixbuf
-		return False
-
 
-	def draw_tune(self, jid, account):
+		model_column = self._pep_type_to_model_column[pep_type]
 		iters = self._get_contact_iter(jid, account, model=self.model)
-		if not iters or not gajim.config.get('show_tunes_in_roster'):
+		if not iters:
 			return
-		jid = self.model[iters[0]][C_JID]
-		jid = jid.decode('utf-8')
+		jid = self.model[iters[0]][C_JID].decode('utf-8')
 		contact = gajim.contacts.get_contact(account, jid)
-		if 'artist' in contact.tune or 'title' in contact.tune:
-			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
-			pixbuf = gtk.gdk.pixbuf_new_from_file(path)
+		if pep_type in contact.pep:
+			pixbuf = contact.pep[pep_type].asPixbufIcon()
 		else:
 			pixbuf = None
 		for child_iter in iters:
-			self.model[child_iter][C_TUNE_PIXBUF] = pixbuf
-		return False
-
+			self.model[child_iter][model_column] = pixbuf
 
 	def draw_avatar(self, jid, account):
 		iters = self._get_contact_iter(jid, account, model=self.model)
 		if not iters or not gajim.config.get('show_avatars_in_roster'):
 			return
-		jid = self.model[iters[0]][C_JID]
-		jid = jid.decode('utf-8')
+		jid = self.model[iters[0]][C_JID].decode('utf-8')
 		pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid)
-		if pixbuf is None or pixbuf == 'ask':
+		if pixbuf in (None, 'ask'):
 			scaled_pixbuf = None
 		else:
 			scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster')
@@ -1361,15 +1319,14 @@ class RosterWindow:
 
 	def draw_completely(self, jid, account):
 		self.draw_contact(jid, account)
-		self.draw_mood(jid, account)
-		self.draw_activity(jid, account)
-		self.draw_tune(jid, account)
+		self.draw_all_pep_types(jid, account)
 		self.draw_avatar(jid, account)
 
 	def adjust_and_draw_contact_context(self, jid, account):
-		'''Draw contact, account and groups of given jid
-		Show contact if it has pending events
-		'''
+		"""
+		Draw contact, account and groups of given jid Show contact if it has
+		pending events
+		"""
 		contact = gajim.contacts.get_first_contact_from_jid(account, jid)
 		if not contact:
 			# idle draw or just removed SelfContact
@@ -1387,12 +1344,13 @@ class RosterWindow:
 			self._adjust_group_expand_collapse_state(group, account)
 
 	def _idle_draw_jids_of_account(self, jids, account):
-		'''Draw given contacts and their avatars in a lazy fashion.
+		"""
+		Draw given contacts and their avatars in a lazy fashion
 
 		Keyword arguments:
 		jids -- a list of jids to draw
 		account -- the corresponding account
-		'''
+		"""
 		def _draw_all_contacts(jids, account):
 			for jid in jids:
 				family = gajim.contacts.get_metacontacts_family(account, jid)
@@ -1411,13 +1369,16 @@ class RosterWindow:
 		gobject.idle_add(task.next)
 
 	def setup_and_draw_roster(self):
-		'''create new empty model and draw roster'''
+		"""
+		Create new empty model and draw roster
+		"""
 		self.modelfilter = None
 		# (icon, name, type, jid, account, editable, mood_pixbuf,
-		# activity_pixbuf, tune_pixbuf avatar_pixbuf, padlock_pixbuf)
+		# activity_pixbuf, tune_pixbuf, location_pixbuf, avatar_pixbuf,
+		# padlock_pixbuf)
 		self.model = gtk.TreeStore(gtk.Image, str, str, str, str,
 			gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf,
-			gtk.gdk.Pixbuf, gtk.gdk.Pixbuf)
+			gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf)
 
 		self.model.set_sort_func(1, self._compareIters)
 		self.model.set_sort_column_id(1, gtk.SORT_ASCENDING)
@@ -1435,8 +1396,9 @@ class RosterWindow:
 
 
 	def select_contact(self, jid, account):
-		'''Select contact in roster. If contact is hidden but has events,
-		show him.'''
+		"""
+		Select contact in roster. If contact is hidden but has events, show him
+		"""
 		# Refiltering SHOULD NOT be needed:
 		# When a contact gets a new event he will be redrawn and his
 		# icon changes, so _visible_func WILL be called on him anyway
@@ -1455,7 +1417,9 @@ class RosterWindow:
 
 
 	def _adjust_account_expand_collapse_state(self, account):
-		'''Expand/collapse account row based on self.collapsed_rows'''
+		"""
+		Expand/collapse account row based on self.collapsed_rows
+		"""
 		iterA = self._get_account_iter(account)
 		if not iterA:
 			# thank you modelfilter
@@ -1469,7 +1433,9 @@ class RosterWindow:
 
 
 	def _adjust_group_expand_collapse_state(self, group, account):
-		'''Expand/collapse group row based on self.collapsed_rows'''
+		"""
+		Expand/collapse group row based on self.collapsed_rows
+		"""
 		iterG = self._get_group_iter(group, account)
 		if not iterG:
 			# Group not visible
@@ -1496,7 +1462,9 @@ class RosterWindow:
 		self.filtering = False
 
 	def contact_has_pending_roster_events(self, contact, account):
-		'''Return True if the contact or one if it resources has pending events'''
+		"""
+		Return True if the contact or one if it resources has pending events
+		"""
 		# jid has pending events
 		if gajim.events.get_nb_roster_events(account, contact.jid) > 0:
 			return True
@@ -1521,7 +1489,9 @@ class RosterWindow:
 		return True
 
 	def _visible_func(self, model, titer):
-		'''Determine whether iter should be visible in the treeview'''
+		"""
+		Determine whether iter should be visible in the treeview
+		"""
 		type_ = model[titer][C_TYPE]
 		if not type_:
 			return False
@@ -1593,7 +1563,9 @@ class RosterWindow:
 		return True
 
 	def _compareIters(self, model, iter1, iter2, data=None):
-		'''Compare two iters to sort them'''
+		"""
+		Compare two iters to sort them
+		"""
 		name1 = model[iter1][C_NAME]
 		name2 = model[iter2][C_NAME]
 		if not name1 or not name2:
@@ -1628,9 +1600,7 @@ class RosterWindow:
 		account1 = account1.decode('utf-8')
 		account2 = account2.decode('utf-8')
 		if type1 == 'account':
-			if account1 < account2:
-				return -1
-			return 1
+			return locale.strcoll(account1, account2)
 		jid1 = model[iter1][C_JID].decode('utf-8')
 		jid2 = model[iter2][C_JID].decode('utf-8')
 		if type1 == 'contact':
@@ -1677,20 +1647,23 @@ class RosterWindow:
 			elif show1 > show2:
 				return 1
 		# We compare names
-		if name1.lower() < name2.lower():
+		cmp_result = locale.strcoll(name1.lower(), name2.lower())
+		if cmp_result < 0:
 			return -1
-		if name2.lower() < name1.lower():
+		if cmp_result > 0:
 			return 1
 		if type1 == 'contact' and type2 == 'contact':
 			# We compare account names
-			if account1.lower() < account2.lower():
+			cmp_result = locale.strcoll(account1.lower(), account2.lower())
+			if cmp_result < 0:
 				return -1
-			if account2.lower() < account1.lower():
+			if cmp_result > 0:
 				return 1
 			# We compare jids
-			if jid1.lower() < jid2.lower():
+			cmp_result = locale.strcoll(jid1.lower(), jid2.lower())
+			if cmp_result < 0:
 				return -1
-			if jid2.lower() < jid1.lower():
+			if cmp_result > 0:
 				return 1
 		return 0
 
@@ -1700,8 +1673,10 @@ class RosterWindow:
 ################################################################################
 
 	def fire_up_unread_messages_events(self, account):
-		'''reads from db the unread messages, and fire them up, and
-		if we find very old unread messages, delete them from unread table'''
+		"""
+		Read from db the unread messages, and fire them up, and if we find very
+		old unread messages, delete them from unread table
+		"""
 		results = gajim.logger.get_unread_msgs()
 		for result in results:
 			jid = result[4]
@@ -1726,7 +1701,9 @@ class RosterWindow:
 				gajim.logger.set_read_messages([result[0]])
 
 	def fill_contacts_and_groups_dicts(self, array, account):
-		'''fill gajim.contacts and gajim.groups'''
+		"""
+		Fill gajim.contacts and gajim.groups
+		"""
 		# FIXME: This function needs to be splitted
 		# Most of the logic SHOULD NOT be done at GUI level
 		if account not in gajim.contacts.get_accounts():
@@ -1800,11 +1777,12 @@ class RosterWindow:
 		return False
 
 	def on_event_removed(self, event_list):
-		'''Remove contacts on last events removed.
+		"""
+		Remove contacts on last events removed
 
-		Only performed if removal was requested before 	but the contact
-		still had pending events
-		'''
+		Only performed if removal was requested before but the contact still had
+		pending events
+		"""
 		contact_list = ((event.jid.split('/')[0], event.account) for event in \
 			event_list)
 
@@ -1820,7 +1798,9 @@ class RosterWindow:
 		self.show_title()
 
 	def open_event(self, account, jid, event):
-		'''If an event was handled, return True, else return False'''
+		"""
+		If an event was handled, return True, else return False
+		"""
 		data = event.parameters
 		ft = gajim.interface.instances['file_transfers']
 		event = gajim.events.get_first_event(account, jid, event.type_)
@@ -1866,6 +1846,11 @@ class RosterWindow:
 			gajim.interface.show_unsubscribed_dialog(account, data)
 			gajim.events.remove_events(account, jid, event)
 			return True
+		elif event.type_ == 'jingle-incoming':
+			peerjid, sid, content_types = data
+			dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types)
+			gajim.events.remove_events(account, jid, event)
+			return True
 		return False
 
 ################################################################################
@@ -1896,14 +1881,18 @@ class RosterWindow:
 
 
 	def authorize(self, widget, jid, account):
-		'''Authorize a contact (by re-sending auth menuitem)'''
+		"""
+		Authorize a contact (by re-sending auth menuitem)
+		"""
 		gajim.connections[account].send_authorization(jid)
 		dialogs.InformationDialog(_('Authorization has been sent'),
 			_('Now "%s" will know your status.') %jid)
 
 	def req_sub(self, widget, jid, txt, account, groups=[], nickname=None,
-	auto_auth=False):
-		'''Request subscription to a contact'''
+			auto_auth=False):
+		"""
+		Request subscription to a contact
+		"""
 		gajim.connections[account].request_subscription(jid, txt, nickname,
 			groups, auto_auth, gajim.nicks[account])
 		contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
@@ -1930,7 +1919,9 @@ class RosterWindow:
 		self.add_contact(jid, account)
 
 	def revoke_auth(self, widget, jid, account):
-		'''Revoke a contact's authorization'''
+		"""
+		Revoke a contact's authorization
+		"""
 		gajim.connections[account].refuse_authorization(jid)
 		dialogs.InformationDialog(_('Authorization has been removed'),
 			_('Now "%s" will always see you as offline.') %jid)
@@ -1966,36 +1957,36 @@ class RosterWindow:
 
 		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:
+	def send_pep(self, account, pep_dict):
+		connection = gajim.connections[account]
+
+		if 'activity' in pep_dict:
 			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)
+			subactivity = pep_dict.get('subactivity', None)
+			activity_text = pep_dict.get('activity_text', None)
+			connection.send_activity(activity, subactivity, activity_text)
 		else:
-			pep.user_send_activity(account, '')
+			connection.retract_activity()
 
-		# mood
-		if 'mood' in pep_dict and pep_dict['mood'] in pep.MOODS:
+		if 'mood' in pep_dict:
 			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)
+			mood_text = pep_dict.get('mood_text', None)
+			connection.send_mood(mood, mood_text)
 		else:
-			pep.user_send_mood(account, '')
+			connection.retract_mood()
+
+	def delete_pep(self, jid, account):
+		if jid == gajim.get_jid_from_account(account):
+			gajim.connections[account].pep = {}
+			self.draw_account(account)
+
+		for contact in gajim.contacts.get_contacts(account, jid):
+			contact.pep = {}
+
+		self.draw_all_pep_types(jid, account)
+		ctrl = gajim.interface.msg_win_mgr.get_control(jid, account)
+		if ctrl:
+			ctrl.update_all_pep_types()
 
 	def send_status_continue(self, account, status, txt, auto, to):
 		if gajim.account_is_connected(account) and not to:
@@ -2010,8 +2001,7 @@ class RosterWindow:
 			gajim.connections[account].send_custom_status(status, txt, to)
 		else:
 			if status in ('invisible', 'offline'):
-				pep.delete_pep(gajim.get_jid_from_account(account), \
-					account)
+				self.delete_pep(gajim.get_jid_from_account(account), account)
 			was_invisible = gajim.connections[account].connected == \
 				gajim.SHOW_LIST.index('invisible')
 			gajim.connections[account].change_status(status, txt, auto)
@@ -2038,7 +2028,9 @@ class RosterWindow:
 
 
 	def chg_contact_status(self, contact, show, status, account):
-		'''When a contact changes his or her status'''
+		"""
+		When a contact changes his or her status
+		"""
 		contact_instances = gajim.contacts.get_contacts(account, contact.jid)
 		contact.show = show
 		contact.status = status
@@ -2089,14 +2081,16 @@ class RosterWindow:
 			contact_instances)
 		if not keep_pep and contact.jid != gajim.get_jid_from_account(account) \
 		and not contact.is_groupchat():
-			pep.delete_pep(contact.jid, account)
+			self.delete_pep(contact.jid, account)
 
 		# Redraw everything and select the sender
 		self.adjust_and_draw_contact_context(contact.jid, account)
 
 
 	def on_status_changed(self, account, show):
-		'''the core tells us that our status has changed'''
+		"""
+		The core tells us that our status has changed
+		"""
 		if account not in gajim.contacts.get_accounts():
 			return
 		child_iterA = self._get_account_iter(account, self.model)
@@ -2131,13 +2125,15 @@ class RosterWindow:
 		self.update_status_combobox()
 
 	def get_status_message(self, show, on_response, show_pep=True,
-	always_ask=False):
-		''' get the status message by:
+			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
 		show_pep can be False to hide pep things from status message or True
-		'''
+		"""
 		empty_pep = {'activity': '', 'subactivity': '', 'activity_text': '',
 			'mood': '', 'mood_text': ''}
 		if show in gajim.config.get_per('defaultstatusmsg'):
@@ -2219,7 +2215,9 @@ class RosterWindow:
 				gajim.config.get('roster_height'))
 
 	def close_all_from_dict(self, dic):
-		'''close all the windows in the given dictionary'''
+		"""
+		Close all the windows in the given dictionary
+		"""
 		for w in dic.values():
 			if isinstance(w, dict):
 				self.close_all_from_dict(w)
@@ -2227,9 +2225,10 @@ class RosterWindow:
 				w.window.destroy()
 
 	def close_all(self, account, force=False):
-		'''close all the windows from an account
-		if force is True, do not ask confirmation before closing chat/gc windows
-		'''
+		"""
+		Close all the windows from an account. If force is True, do not ask
+		confirmation before closing chat/gc windows
+		"""
 		if account in gajim.interface.instances:
 			self.close_all_from_dict(gajim.interface.instances[account])
 		for ctrl in gajim.interface.msg_win_mgr.get_controls(acct=account):
@@ -2237,7 +2236,9 @@ class RosterWindow:
 				force = force)
 
 	def on_roster_window_delete_event(self, widget, event):
-		'''Main window X button was clicked'''
+		"""
+		Main window X button was clicked
+		"""
 		if gajim.interface.systray_enabled and not gajim.config.get(
 		'quit_on_roster_x_button') and gajim.config.get('trayicon') != 'on_event':
 			self.tooltip.hide_tooltip()
@@ -2287,14 +2288,18 @@ class RosterWindow:
 			gajim.interface.hide_systray()
 
 	def quit_gtkgui_interface(self):
-		'''When we quit the gtk interface : exit gtk'''
+		"""
+		When we quit the gtk interface - exit gtk
+		"""
 		self.prepare_quit()
 		gtk.main_quit()
 
 	def on_quit_request(self, widget=None):
-		''' user want to quit. Check if he should be warned about messages
-		pending. Terminate all sessions and send offline to all connected
-		account. We do NOT really quit gajim here '''
+		"""
+		User wants to quit. Check if he should be warned about messages pending.
+		Terminate all sessions and send offline to all connected account. We do
+		NOT really quit gajim here
+		"""
 		accounts = gajim.connections.keys()
 		get_msg = False
 		for acct in accounts:
@@ -2302,7 +2307,7 @@ class RosterWindow:
 				get_msg = True
 				break
 
-		def on_continue2(message, pep_dict):
+		def on_continue3(message, pep_dict):
 			self.quit_on_next_offline = 0
 			accounts_to_disconnect = []
 			for acct in accounts:
@@ -2317,6 +2322,25 @@ class RosterWindow:
 			if not self.quit_on_next_offline:
 				self.quit_gtkgui_interface()
 
+		def on_continue2(message, pep_dict):
+			# check if there is an active file transfer
+			from common.protocol.bytestream import (is_transfer_active)
+			files_props = gajim.interface.instances['file_transfers'].files_props
+			transfer_active = False
+			for x in files_props:
+				for y in files_props[x]:
+					if is_transfer_active(files_props[x][y]):
+						transfer_active = True
+						break
+
+			if transfer_active:
+				dialogs.ConfirmationDialog(_('You have running file transfers'),
+					_('If you quit now, the file(s) being transfered will be '
+					'stopped. Do you still want to quit?'),
+					on_response_ok=(on_continue3, message, pep_dict))
+				return
+			on_continue3(message, pep_dict)
+
 		def on_continue(message, pep_dict):
 			if message is None:
 				# user pressed Cancel to change status message dialog
@@ -2363,7 +2387,9 @@ class RosterWindow:
 		self.make_menu()
 
 	def on_edit_menuitem_activate(self, widget):
-		'''need to call make_menu to build profile, avatar item'''
+		"""
+		Need to call make_menu to build profile, avatar item
+		"""
 		self.make_menu()
 
 	def on_bookmark_menuitem_activate(self, widget, account, bookmark):
@@ -2414,7 +2440,9 @@ class RosterWindow:
 			helpers.exec_command('%s history_manager.py' % sys.executable)
 
 	def on_info(self, widget, contact, account):
-		'''Call vcard_information_window class to display contact's information'''
+		"""
+		Call vcard_information_window class to display contact's information
+		"""
 		if gajim.connections[account].is_zeroconf:
 			self.on_info_zeroconf(widget, contact, account)
 			return
@@ -2503,11 +2531,10 @@ class RosterWindow:
 				account_name = account
 				if gajim.account_is_connected(account):
 					account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total))
-				contact = gajim.contacts.create_contact(jid=jid, account=account, name=account_name,
-					show=connection.get_status(), sub='', status=connection.status,
-					resource=connection.server_resource,
-					priority=connection.priority, mood=connection.mood,
-					tune=connection.tune, activity=connection.activity)
+				contact = gajim.contacts.create_self_contact(jid=jid, account=account,
+					name=account_name, show=connection.get_status(),
+					status=connection.status, resource=connection.server_resource,
+					priority=connection.priority)
 				if gajim.connections[account].gpg:
 					contact.keyID = gajim.config.get_per('accounts', connection.name,
 						'keyid')
@@ -2544,16 +2571,22 @@ class RosterWindow:
 						self.show_tooltip, contacts)
 
 	def on_agent_logging(self, widget, jid, state, account):
-		'''When an agent is requested to log in or off'''
+		"""
+		When an agent is requested to log in or off
+		"""
 		gajim.connections[account].send_agent_status(jid, state)
 
 	def on_edit_agent(self, widget, contact, account):
-		'''When we want to modify the agent registration'''
+		"""
+		When we want to modify the agent registration
+		"""
 		gajim.connections[account].request_register_agent_info(contact.jid)
 
 	def on_remove_agent(self, widget, list_):
-		'''When an agent is requested to be removed. list_ is a list of
-		(contact, account) tuple'''
+		"""
+		When an agent is requested to be removed. list_ is a list of (contact,
+		account) tuple
+		"""
 		for (contact, account) in list_:
 			if gajim.config.get_per('accounts', account, 'hostname') == \
 			contact.jid:
@@ -2597,8 +2630,10 @@ class RosterWindow:
 			on_response_ok = (remove, list_))
 
 	def on_block(self, widget, list_, group=None):
-		''' When clicked on the 'block' button in context menu.
-		list_ is a list of (contact, account)'''
+		"""
+		When clicked on the 'block' button in context menu. list_ is a list of
+		(contact, account)
+		"""
 		def on_continue(msg, pep_dict):
 			if msg is None:
 				# user pressed Cancel to change status message dialog
@@ -2661,7 +2696,9 @@ class RosterWindow:
 			_('Do _not ask me again'), on_response_ok=_block_it)
 
 	def on_unblock(self, widget, list_, group=None):
-		''' When clicked on the 'unblock' button in context menu. '''
+		"""
+		When clicked on the 'unblock' button in context menu.
+		"""
 		accounts = []
 		if group is None:
 			for (contact, account) in list_:
@@ -2878,7 +2915,9 @@ class RosterWindow:
 		dialogs.EditGroupsDialog(list_)
 
 	def on_history(self, widget, contact, account):
-		'''When history menuitem is activated: call log window'''
+		"""
+		When history menuitem is activated: call log window
+		"""
 		if 'logs' in gajim.interface.instances:
 			gajim.interface.instances['logs'].window.present()
 			gajim.interface.instances['logs'].open_history(contact.jid, account)
@@ -2887,7 +2926,9 @@ class RosterWindow:
 				HistoryWindow(contact.jid, account)
 
 	def on_disconnect(self, widget, jid, account):
-		'''When disconnect menuitem is activated: disconect from room'''
+		"""
+		When disconnect menuitem is activated: disconect from room
+		"""
 		if jid in gajim.interface.minimized_controls[account]:
 			ctrl = gajim.interface.minimized_controls[account][jid]
 			ctrl.shutdown()
@@ -2895,7 +2936,9 @@ class RosterWindow:
 		self.remove_groupchat(jid, account)
 
 	def on_reconnect(self, widget, jid, account):
-		'''When disconnect menuitem is activated: disconect from room'''
+		"""
+		When disconnect menuitem is activated: disconect from room
+		"""
 		if jid in gajim.interface.minimized_controls[account]:
 			ctrl = gajim.interface.minimized_controls[account][jid]
 		gajim.interface.join_gc_room(account, jid, ctrl.nick,
@@ -2922,8 +2965,9 @@ class RosterWindow:
 		dialogs.AddSpecialNotificationDialog(jid)
 
 	def on_invite_to_new_room(self, widget, list_, resource=None):
-		''' resource parameter MUST NOT be used if more than one contact in
-		list '''
+		"""
+		Resource parameter MUST NOT be used if more than one contact in list
+		"""
 		account_list = []
 		jid_list = []
 		for (contact, account) in list_:
@@ -2952,9 +2996,10 @@ class RosterWindow:
 				break
 
 	def on_invite_to_room(self, widget, list_, room_jid, room_account,
-		resource=None):
-		''' resource parameter MUST NOT be used if more than one contact in
-		list '''
+			resource=None):
+		"""
+		Resource parameter MUST NOT be used if more than one contact in list
+		"""
 		for e in list_:
 			contact = e[0]
 			contact_jid = contact.jid
@@ -2967,7 +3012,9 @@ class RosterWindow:
 			self.on_groupchat_maximized(widget, contact.jid, account)
 
 	def on_groupchat_maximized(self, widget, jid, account):
-		'''When a groupchat is maximised'''
+		"""
+		When a groupchat is maximized
+		"""
 		if not jid in gajim.interface.minimized_controls[account]:
 			# Already opened?
 			gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, account)
@@ -3023,7 +3070,9 @@ class RosterWindow:
 		self.tooltip.hide_tooltip()
 
 	def on_roster_treeview_key_press_event(self, widget, event):
-		'''when a key is pressed in the treeviews'''
+		"""
+		When a key is pressed in the treeviews
+		"""
 		self.tooltip.hide_tooltip()
 		if event.keyval == gtk.keysyms.Escape:
 			self.tree.get_selection().unselect_all()
@@ -3046,6 +3095,9 @@ class RosterWindow:
 				return
 			type_ = model[list_of_paths[0]][C_TYPE]
 			account = model[list_of_paths[0]][C_ACCOUNT].decode('utf-8')
+			if type_ in ('account', 'group', 'self_contact') or \
+			account == gajim.ZEROCONF_ACC_NAME:
+				return
 			list_ = []
 			for path in list_of_paths:
 				if model[path][C_TYPE] != type_:
@@ -3055,9 +3107,6 @@ class RosterWindow:
 				contact = gajim.contacts.get_contact_with_highest_priority(account,
 					jid)
 				list_.append((contact, account))
-			if type_ in ('account', 'group', 'self_contact') or \
-			account == gajim.ZEROCONF_ACC_NAME:
-				return
 			if type_ == 'contact':
 				self.on_req_usub(widget, list_)
 			elif type_ == 'agent':
@@ -3170,7 +3219,9 @@ class RosterWindow:
 						self.tree.expand_row(path, False)
 
 	def on_req_usub(self, widget, list_):
-		'''Remove a contact. list_ is a list of (contact, account) tuples'''
+		"""
+		Remove a contact. list_ is a list of (contact, account) tuples
+		"""
 		def on_ok(is_checked, list_):
 			remove_auth = True
 			if len(list_) == 1:
@@ -3229,7 +3280,9 @@ class RosterWindow:
 				on_response_ok = (on_ok2, list_))
 
 	def on_send_custom_status(self, widget, contact_list, show, group=None):
-		'''send custom status'''
+		"""
+		Send custom status
+		"""
 		# contact_list has only one element except if group != None
 		def on_response(message, pep_dict):
 			if message is None: # None if user pressed Cancel
@@ -3286,7 +3339,9 @@ class RosterWindow:
 			_('Do _not ask me again'), on_response_ok=send_it)
 
 	def on_status_combobox_changed(self, widget):
-		'''When we change our status via the combobox'''
+		"""
+		When we change our status via the combobox
+		"""
 		model = self.status_combobox.get_model()
 		active = self.status_combobox.get_active()
 		if active == -1: # no active item
@@ -3396,23 +3451,35 @@ class RosterWindow:
 			gajim.interface.instances['plugins'] = plugins.gui.PluginsWindow()
 
 	def on_publish_tune_toggled(self, widget, account):
-		act = widget.get_active()
-		gajim.config.set_per('accounts', account, 'publish_tune', act)
-		if act:
+		active = widget.get_active()
+		gajim.config.set_per('accounts', account, 'publish_tune', active)
+		if active:
 			gajim.interface.enable_music_listener()
 		else:
-			# disable it only if no other account use it
-			for acct in gajim.connections:
-				if gajim.config.get_per('accounts', acct, 'publish_tune'):
+			gajim.connections[account].retract_tune()
+			# disable music listener only if no other account uses it
+			for acc in gajim.connections:
+				if gajim.config.get_per('accounts', acc, 'publish_tune'):
 					break
 			else:
 				gajim.interface.disable_music_listener()
 
-			if gajim.connections[account].pep_supported:
-				# As many implementations don't support retracting items, we send a
-				# "Stopped" event first
-				pep.user_send_tune(account, '')
-				pep.user_retract_tune(account)
+		helpers.update_optional_features(account)
+
+	def on_publish_location_toggled(self, widget, account):
+		active = widget.get_active()
+		gajim.config.set_per('accounts', account, 'publish_location', active)
+		if active:
+			location_listener.enable()
+		else:
+			gajim.connections[account].retract_location()
+			# disable music listener only if no other account uses it
+			for acc in gajim.connections:
+				if gajim.config.get_per('accounts', acc, 'publish_location'):
+					break
+			else:
+				location_listener.disable()
+
 		helpers.update_optional_features(account)
 
 	def on_pep_services_menuitem_activate(self, widget, account):
@@ -3426,7 +3493,9 @@ class RosterWindow:
 		dialogs.AddNewContactWindow(account)
 
 	def on_join_gc_activate(self, widget, account):
-		'''when the join gc menuitem is clicked, show the join gc window'''
+		"""
+		When the join gc menuitem is clicked, show the join gc window
+		"""
 		invisible_show = gajim.SHOW_LIST.index('invisible')
 		if gajim.connections[account].connected == invisible_show:
 			dialogs.ErrorDialog(_('You cannot join a group chat while you are '
@@ -3435,7 +3504,6 @@ class RosterWindow:
 		if 'join_gc' in gajim.interface.instances[account]:
 			gajim.interface.instances[account]['join_gc'].window.present()
 		else:
-			# c http://nkour.blogspot.com/2005/05/pythons-init-return-none-doesnt-return.html
 			try:
 				gajim.interface.instances[account]['join_gc'] = \
 					dialogs.JoinGroupchatWindow(account)
@@ -3489,9 +3557,10 @@ class RosterWindow:
 		gajim.interface.edit_own_details(account)
 
 	def on_execute_command(self, widget, contact, account, resource=None):
-		'''Execute command. Full JID needed; if it is other contact,
-		resource is necessary. Widget is unnecessary, only to be
-		able to make this a callback.'''
+		"""
+		Execute command. Full JID needed; if it is other contact, resource is
+		necessary. Widget is unnecessary, only to be able to make this a callback
+		"""
 		jid = contact.jid
 		if resource is not None:
 			jid = jid + u'/' + resource
@@ -3558,8 +3627,10 @@ class RosterWindow:
 		self.show_treeview_menu(event)
 
 	def on_row_activated(self, widget, path):
-		'''When an iter is activated (double-click or single click if gnome is
-		set this way)'''
+		"""
+		When an iter is activated (double-click or single click if gnome is set
+		this way)
+		"""
 		model = self.modelfilter
 		account = model[path][C_ACCOUNT].decode('utf-8')
 		type_ = model[path][C_TYPE]
@@ -3623,12 +3694,16 @@ class RosterWindow:
 			resource=resource, session=session)
 
 	def on_roster_treeview_row_activated(self, widget, path, col=0):
-		'''When an iter is double clicked: open the first event window'''
+		"""
+		When an iter is double clicked: open the first event window
+		"""
 		if not gajim.single_click:
 			self.on_row_activated(widget, path)
 
 	def on_roster_treeview_row_expanded(self, widget, titer, path):
-		'''When a row is expanded change the icon of the arrow'''
+		"""
+		When a row is expanded change the icon of the arrow
+		"""
 		self._toggeling_row = True
 		model = widget.get_model()
 		child_model = model.get_model()
@@ -3688,7 +3763,9 @@ class RosterWindow:
 		self._toggeling_row = False
 
 	def on_roster_treeview_row_collapsed(self, widget, titer, path):
-		'''When a row is collapsed change the icon of the arrow'''
+		"""
+		When a row is collapsed change the icon of the arrow
+		"""
 		self._toggeling_row = True
 		model = widget.get_model()
 		child_model = model.get_model()
@@ -3732,10 +3809,11 @@ class RosterWindow:
 		self._toggeling_row = False
 
 	def on_modelfilter_row_has_child_toggled(self, model, path, titer):
-		'''Called when a row has gotten the first or lost its last child row.
+		"""
+		Called when a row has gotten the first or lost its last child row
 
 		Expand Parent if necessary.
-		'''
+		"""
 		if self._toggeling_row:
 			# Signal is emitted when we write to our model
 			return
@@ -3804,8 +3882,9 @@ class RosterWindow:
 				pass
 
 	def on_show_offline_contacts_menuitem_activate(self, widget):
-		'''when show offline option is changed:
-		redraw the treeview'''
+		"""
+		When show offline option is changed: redraw the treeview
+		"""
 		gajim.config.set('showoffline', not gajim.config.get('showoffline'))
 		self.refilter_shown_roster_items()
 		w = self.xml.get_widget('show_only_active_contacts_menuitem')
@@ -3818,8 +3897,9 @@ class RosterWindow:
 			w.set_sensitive(True)
 
 	def on_show_only_active_contacts_menuitem_activate(self, widget):
-		'''when show only active contact option is changed:
-		redraw the treeview'''
+		"""
+		When show only active contact option is changed: redraw the treeview
+		"""
 		gajim.config.set('show_only_chat_and_online', not gajim.config.get(
 			'show_only_chat_and_online'))
 		self.refilter_shown_roster_items()
@@ -3935,6 +4015,9 @@ class RosterWindow:
 				_account = data['account']
 				_jid = data['jid']
 				_contact = gajim.contacts.get_first_contact_from_jid(_account, _jid)
+				if not _contact:
+					# One of the metacontacts may be not connected.
+					continue
 
 				_contact.groups = c_dest.groups[:]
 				gajim.contacts.add_metacontact(account_dest, c_dest.jid,
@@ -4228,10 +4311,12 @@ class RosterWindow:
 ################################################################################
 
 	def get_appropriate_state_images(self, jid, size='16', icon_name='online'):
-		'''check jid and return the appropriate state images dict for
-		the demanded size. icon_name is taken into account when jid is from
-		transport: transport iconset doesn't contain all icons, so we fall back
-		to jabber one'''
+		"""
+		Check jid and return the appropriate state images dict for the demanded
+		size. icon_name is taken into account when jid is from transport:
+		transport iconset doesn't contain all icons, so we fall back to jabber
+		one
+		"""
 		transport = gajim.get_transport_name_from_jid(jid)
 		if transport and size in self.transports_state_images:
 			if transport not in self.transports_state_images[size]:
@@ -4243,7 +4328,9 @@ class RosterWindow:
 		return gajim.interface.jabber_state_images[size]
 
 	def make_transport_state_images(self, transport):
-		'''initialise opened and closed 'transport' iconset dict'''
+		"""
+		Initialize opened and closed 'transport' iconset dict
+		"""
 		if gajim.config.get('use_transports_iconsets'):
 			folder = os.path.join(helpers.get_transport_path(transport),
 				'16x16')
@@ -4340,7 +4427,9 @@ class RosterWindow:
 			win.repaint_themed_widgets()
 
 	def repaint_themed_widgets(self):
-		'''Notify windows that contain themed widgets to repaint them'''
+		"""
+		Notify windows that contain themed widgets to repaint them
+		"""
 		for win in gajim.interface.msg_win_mgr.windows():
 			win.repaint_themed_widgets()
 		for account in gajim.connections:
@@ -4359,13 +4448,17 @@ class RosterWindow:
 			ctrl.show_avatar()
 
 	def on_roster_treeview_style_set(self, treeview, style):
-		'''When style (theme) changes, redraw all contacts'''
+		"""
+		When style (theme) changes, redraw all contacts
+		"""
 		for contact in self._iter_contact_rows():
 			self.draw_contact(contact[C_JID].decode('utf-8'),
 				contact[C_ACCOUNT].decode('utf-8'))
 
 	def set_renderer_color(self, renderer, style, set_background=True):
-		'''set style for treeview cell, using PRELIGHT system color'''
+		"""
+		Set style for treeview cell, using PRELIGHT system color
+		"""
 		if set_background:
 			bgcolor = self.tree.style.bg[style]
 			renderer.set_property('cell-background-gdk', bgcolor)
@@ -4374,22 +4467,15 @@ class RosterWindow:
 			renderer.set_property('foreground-gdk', fgcolor)
 
 	def _iconCellDataFunc(self, column, renderer, model, titer, data=None):
-		'''When a row is added, set properties for icon renderer'''
-		theme = gajim.config.get('roster_theme')
+		"""
+		When a row is added, set properties for icon renderer
+		"""
 		type_ = model[titer][C_TYPE]
 		if type_ == 'account':
-			color = gajim.config.get_per('themes', theme, 'accountbgcolor')
-			if color:
-				renderer.set_property('cell-background', color)
-			else:
-				self.set_renderer_color(renderer, gtk.STATE_ACTIVE)
+			self._set_account_row_background_color(renderer)
 			renderer.set_property('xalign', 0)
 		elif type_ == 'group':
-			color = gajim.config.get_per('themes', theme, 'groupbgcolor')
-			if color:
-				renderer.set_property('cell-background', color)
-			else:
-				self.set_renderer_color(renderer, gtk.STATE_PRELIGHT)
+			self._set_group_row_background_color(renderer)	
 			renderer.set_property('xalign', 0.2)
 		elif type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
 			if not model[titer][C_JID] or not model[titer][C_ACCOUNT]:
@@ -4397,18 +4483,7 @@ class RosterWindow:
 				return
 			jid = model[titer][C_JID].decode('utf-8')
 			account = model[titer][C_ACCOUNT].decode('utf-8')
-			if jid in gajim.newly_added[account]:
-				renderer.set_property('cell-background', gajim.config.get(
-					'just_connected_bg_color'))
-			elif jid in gajim.to_be_removed[account]:
-				renderer.set_property('cell-background', gajim.config.get(
-					'just_disconnected_bg_color'))
-			else:
-				color = gajim.config.get_per('themes', theme, 'contactbgcolor')
-				if color:
-					renderer.set_property('cell-background', color)
-				else:
-					renderer.set_property('cell-background', None)
+			self._set_contact_row_background_color(renderer, jid, account)
 			parent_iter = model.iter_parent(titer)
 			if model[parent_iter][C_TYPE] == 'contact':
 				renderer.set_property('xalign', 1)
@@ -4417,7 +4492,9 @@ class RosterWindow:
 		renderer.set_property('width', 26)
 
 	def _nameCellDataFunc(self, column, renderer, model, titer, data=None):
-		'''When a row is added, set properties for name renderer'''
+		"""
+		When a row is added, set properties for name renderer
+		"""
 		theme = gajim.config.get('roster_theme')
 		type_ = model[titer][C_TYPE]
 		if type_ == 'account':
@@ -4426,29 +4503,21 @@ class RosterWindow:
 				renderer.set_property('foreground', color)
 			else:
 				self.set_renderer_color(renderer, gtk.STATE_ACTIVE, False)
-			color = gajim.config.get_per('themes', theme, 'accountbgcolor')
-			if color:
-				renderer.set_property('cell-background', color)
-			else:
-				self.set_renderer_color(renderer, gtk.STATE_ACTIVE)
 			renderer.set_property('font',
 				gtkgui_helpers.get_theme_font_for_option(theme, 'accountfont'))
 			renderer.set_property('xpad', 0)
 			renderer.set_property('width', 3)
+			self._set_account_row_background_color(renderer)
 		elif type_ == 'group':
 			color = gajim.config.get_per('themes', theme, 'grouptextcolor')
 			if color:
 				renderer.set_property('foreground', color)
 			else:
 				self.set_renderer_color(renderer, gtk.STATE_PRELIGHT, False)
-			color = gajim.config.get_per('themes', theme, 'groupbgcolor')
-			if color:
-				renderer.set_property('cell-background', color)
-			else:
-				self.set_renderer_color(renderer, gtk.STATE_PRELIGHT)
 			renderer.set_property('font',
 				gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont'))
 			renderer.set_property('xpad', 4)
+			self._set_group_row_background_color(renderer)
 		elif type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
 			if not model[titer][C_JID] or not model[titer][C_ACCOUNT]:
 				# This can append when at the moment we add the row
@@ -4468,18 +4537,7 @@ class RosterWindow:
 				renderer.set_property('foreground', color)
 			else:
 				renderer.set_property('foreground', None)
-			if jid in gajim.newly_added[account]:
-				renderer.set_property('cell-background', gajim.config.get(
-					'just_connected_bg_color'))
-			elif jid in gajim.to_be_removed[account]:
-				renderer.set_property('cell-background', gajim.config.get(
-					'just_disconnected_bg_color'))
-			else:
-				color = gajim.config.get_per('themes', theme, 'contactbgcolor')
-				if color:
-					renderer.set_property('cell-background', color)
-				else:
-					renderer.set_property('cell-background', None)
+			self._set_contact_row_background_color(renderer, jid, account)
 			renderer.set_property('font',
 				gtkgui_helpers.get_theme_font_for_option(theme, 'contactfont'))
 			parent_iter = model.iter_parent(titer)
@@ -4488,170 +4546,36 @@ class RosterWindow:
 			else:
 				renderer.set_property('xpad', 8)
 
-
-	def _fill_mood_pixbuf_renderer(self, column, renderer, model, titer,
-	data = None):
-		'''When a row is added, set properties for avatar renderer'''
+	def _fill_pep_pixbuf_renderer(self, column, renderer, model, titer,
+			data=None):
+		"""
+		When a row is added, draw the respective pep icon
+		"""
 		theme = gajim.config.get('roster_theme')
 		type_ = model[titer][C_TYPE]
-		if type_ == 'group':
-			renderer.set_property('visible', False)
-			return
 
 		# allocate space for the icon only if needed
-		if model[titer][C_MOOD_PIXBUF]:
-			renderer.set_property('visible', True)
-		else:
+		if not model[titer][data]:
 			renderer.set_property('visible', False)
-		if type_ == 'account':
-			color = gajim.config.get_per('themes', theme,
-				'accountbgcolor')
-			if color:
-				renderer.set_property('cell-background', color)
-			else:
-				self.set_renderer_color(renderer,
-					gtk.STATE_ACTIVE)
-			# align pixbuf to the right)
-			renderer.set_property('xalign', 1)
-		# prevent type_ = None, see http://trac.gajim.org/ticket/2534
-		elif type_:
-			if not model[titer][C_JID] \
-			or not model[titer][C_ACCOUNT]:
-				# This can append at the moment we add the row
-				return
-			jid = model[titer][C_JID].decode('utf-8')
-			account = model[titer][C_ACCOUNT].decode('utf-8')
-			if jid in gajim.newly_added[account]:
-				renderer.set_property('cell-background',
-					gajim.config.get(
-					'just_connected_bg_color'))
-			elif jid in gajim.to_be_removed[account]:
-				renderer.set_property('cell-background',
-					gajim.config.get(
-					'just_disconnected_bg_color'))
-			else:
-				color = gajim.config.get_per('themes',
-					theme, 'contactbgcolor')
-				if color:
-					renderer.set_property(
-						'cell-background', color)
-				else:
-					renderer.set_property(
-						'cell-background', None)
-			# align pixbuf to the right
-			renderer.set_property('xalign', 1)
-
-
-	def _fill_activity_pixbuf_renderer(self, column, renderer, model, titer,
-	data = None):
-		'''When a row is added, set properties for avatar renderer'''
-		theme = gajim.config.get('roster_theme')
-		type_ = model[titer][C_TYPE]
-		if type_ == 'group':
-			renderer.set_property('visible', False)
-			return
-
-		# allocate space for the icon only if needed
-		if model[titer][C_ACTIVITY_PIXBUF]:
-			renderer.set_property('visible', True)
 		else:
-			renderer.set_property('visible', False)
-		if type_ == 'account':
-			color = gajim.config.get_per('themes', theme,
-				'accountbgcolor')
-			if color:
-				renderer.set_property('cell-background', color)
-			else:
-				self.set_renderer_color(renderer,
-					gtk.STATE_ACTIVE)
-			# align pixbuf to the right)
-			renderer.set_property('xalign', 1)
-		# prevent type_ = None, see http://trac.gajim.org/ticket/2534
-		elif type_:
-			if not model[titer][C_JID] \
-			or not model[titer][C_ACCOUNT]:
-				# This can append at the moment we add the row
-				return
-			jid = model[titer][C_JID].decode('utf-8')
-			account = model[titer][C_ACCOUNT].decode('utf-8')
-			if jid in gajim.newly_added[account]:
-				renderer.set_property('cell-background',
-					gajim.config.get(
-					'just_connected_bg_color'))
-			elif jid in gajim.to_be_removed[account]:
-				renderer.set_property('cell-background',
-					gajim.config.get(
-					'just_disconnected_bg_color'))
-			else:
-				color = gajim.config.get_per('themes',
-					theme, 'contactbgcolor')
-				if color:
-					renderer.set_property(
-						'cell-background', color)
-				else:
-					renderer.set_property(
-						'cell-background', None)
-			# align pixbuf to the right
-			renderer.set_property('xalign', 1)
-
-
-	def _fill_tune_pixbuf_renderer(self, column, renderer, model, titer,
-	data = None):
-		'''When a row is added, set properties for avatar renderer'''
-		theme = gajim.config.get('roster_theme')
-		type_ = model[titer][C_TYPE]
-		if type_ == 'group':
-			renderer.set_property('visible', False)
-			return
-
-		# allocate space for the icon only if needed
-		if model[titer][C_TUNE_PIXBUF]:
 			renderer.set_property('visible', True)
-		else:
-			renderer.set_property('visible', False)
-		if type_ == 'account':
-			color = gajim.config.get_per('themes', theme,
-				'accountbgcolor')
-			if color:
-				renderer.set_property('cell-background', color)
-			else:
-				self.set_renderer_color(renderer,
-					gtk.STATE_ACTIVE)
-			# align pixbuf to the right)
-			renderer.set_property('xalign', 1)
-		# prevent type_ = None, see http://trac.gajim.org/ticket/2534
-		elif type_:
-			if not model[titer][C_JID] \
-			or not model[titer][C_ACCOUNT]:
-				# This can append at the moment we add the row
-				return
-			jid = model[titer][C_JID].decode('utf-8')
-			account = model[titer][C_ACCOUNT].decode('utf-8')
-			if jid in gajim.newly_added[account]:
-				renderer.set_property('cell-background',
-					gajim.config.get(
-					'just_connected_bg_color'))
-			elif jid in gajim.to_be_removed[account]:
-				renderer.set_property('cell-background',
-					gajim.config.get(
-					'just_disconnected_bg_color'))
-			else:
-				color = gajim.config.get_per('themes',
-					theme, 'contactbgcolor')
-				if color:
-					renderer.set_property(
-						'cell-background', color)
-				else:
-					renderer.set_property(
-						'cell-background', None)
-			# align pixbuf to the right
-			renderer.set_property('xalign', 1)
 
+			if type_ == 'account':
+				self.set_renderer_color(renderer, gtk.STATE_ACTIVE)
+				renderer.set_property('xalign', 1)
+			elif type_:
+				if not model[titer][C_JID] or not model[titer][C_ACCOUNT]:
+					# This can append at the moment we add the row
+					return
+				jid = model[titer][C_JID].decode('utf-8')
+				account = model[titer][C_ACCOUNT].decode('utf-8')
+				self._set_contact_row_background_color(renderer, jid, account)
 
-	def _fill_avatar_pixbuf_renderer(self, column, renderer, model, titer,
-	data = None):
-		'''When a row is added, set properties for avatar renderer'''
-		theme = gajim.config.get('roster_theme')
+	def _fill_avatar_pixbuf_renderer(self, column, renderer, model, titer, data
+			= None):
+		"""
+		When a row is added, set properties for avatar renderer
+		"""
 		type_ = model[titer][C_TYPE]
 		if type_ in ('group', 'account'):
 			renderer.set_property('visible', False)
@@ -4661,56 +4585,72 @@ class RosterWindow:
 		if model[titer][C_AVATAR_PIXBUF] or \
 		gajim.config.get('avatar_position_in_roster') == 'left':
 			renderer.set_property('visible', True)
+			if type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
+				if not model[titer][C_JID] or not model[titer][C_ACCOUNT]:
+					# This can append at the moment we add the row
+					return
+				jid = model[titer][C_JID].decode('utf-8')
+				account = model[titer][C_ACCOUNT].decode('utf-8')
+				self._set_contact_row_background_color(renderer, jid, account)
 		else:
 			renderer.set_property('visible', False)
-		if type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
-			if not model[titer][C_JID] or not model[titer][C_ACCOUNT]:
-				# This can append at the moment we add the row
-				return
-			jid = model[titer][C_JID].decode('utf-8')
-			account = model[titer][C_ACCOUNT].decode('utf-8')
-			if jid in gajim.newly_added[account]:
-				renderer.set_property('cell-background', gajim.config.get(
-					'just_connected_bg_color'))
-			elif jid in gajim.to_be_removed[account]:
-				renderer.set_property('cell-background', gajim.config.get(
-					'just_disconnected_bg_color'))
-			else:
-				color = gajim.config.get_per('themes', theme, 'contactbgcolor')
-				if color:
-					renderer.set_property('cell-background', color)
-				else:
-					renderer.set_property('cell-background', None)
+
 		if gajim.config.get('avatar_position_in_roster') == 'left':
 			renderer.set_property('width', gajim.config.get('roster_avatar_width'))
 			renderer.set_property('xalign', 0.5)
 		else:
 			renderer.set_property('xalign', 1) # align pixbuf to the right
 
-	def _fill_padlock_pixbuf_renderer(self, column, renderer, model, titer,
-	data = None):
-		'''When a row is added, set properties for padlock renderer'''
-		theme = gajim.config.get('roster_theme')
+	def _fill_padlock_pixbuf_renderer(self, column, renderer, model, titer, data=None):
+		"""
+		When a row is added, set properties for padlock renderer
+		"""
 		type_ = model[titer][C_TYPE]
 		# allocate space for the icon only if needed
 		if type_ == 'account' and model[titer][C_PADLOCK_PIXBUF]:
 			renderer.set_property('visible', True)
-			color = gajim.config.get_per('themes', theme, 'accountbgcolor')
-			if color:
-				renderer.set_property('cell-background', color)
-			else:
-				self.set_renderer_color(renderer, gtk.STATE_ACTIVE)
+			self._set_account_row_background_color(renderer)
 			renderer.set_property('xalign', 1) # align pixbuf to the right
 		else:
 			renderer.set_property('visible', False)
 
+	def _set_account_row_background_color(self, renderer):
+		theme = gajim.config.get('roster_theme')
+		color = gajim.config.get_per('themes', theme, 'accountbgcolor')
+		if color:
+			renderer.set_property('cell-background', color)
+		else:
+			self.set_renderer_color(renderer, gtk.STATE_ACTIVE)
+
+	def _set_contact_row_background_color(self, renderer, jid, account):
+		theme = gajim.config.get('roster_theme')
+		if jid in gajim.newly_added[account]:
+			renderer.set_property('cell-background', gajim.config.get(
+				'just_connected_bg_color'))
+		elif jid in gajim.to_be_removed[account]:
+			renderer.set_property('cell-background', gajim.config.get(
+				'just_disconnected_bg_color'))
+		else:
+			color = gajim.config.get_per('themes', theme, 'contactbgcolor')
+			renderer.set_property('cell-background', color if color else None)
+
+	def _set_group_row_background_color(self, renderer):
+		theme = gajim.config.get('roster_theme')
+		color = gajim.config.get_per('themes', theme, 'groupbgcolor')
+		if color:
+			renderer.set_property('cell-background', color)
+		else:
+			self.set_renderer_color(renderer, gtk.STATE_PRELIGHT)
+
 ################################################################################
 ### Everything about building menus
 ### FIXME: We really need to make it simpler! 1465 lines are a few to much....
 ################################################################################
 
 	def make_menu(self, force=False):
-		'''create the main window\'s menus'''
+		"""
+		Create the main window's menus
+		"""
 		if not force and not self.actions_menu_needs_rebuild:
 			return
 		new_chat_menuitem = self.xml.get_widget('new_chat_menuitem')
@@ -5037,10 +4977,7 @@ class RosterWindow:
 			sub_menu.append(item)
 
 			item = gtk.ImageMenuItem(_('_Change Status Message'))
-			path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png')
-			img = gtk.Image()
-			img.set_from_file(path)
-			item.set_image(img)
+			gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input')
 			sub_menu.append(item)
 			item.connect('activate', self.on_change_status_message_activate,
 				account)
@@ -5059,17 +4996,22 @@ class RosterWindow:
 
 			pep_menuitem = xml.get_widget('pep_menuitem')
 			if gajim.connections[account].pep_supported:
-				have_tune = gajim.config.get_per('accounts', account,
-					'publish_tune')
 				pep_submenu = gtk.Menu()
 				pep_menuitem.set_submenu(pep_submenu)
-				item = gtk.CheckMenuItem(_('Publish Tune'))
-				pep_submenu.append(item)
-				if not dbus_support.supported:
-					item.set_sensitive(False)
-				else:
-					item.set_active(have_tune)
-					item.connect('toggled', self.on_publish_tune_toggled, account)
+				def add_item(label, opt_name, func):
+					item = gtk.CheckMenuItem(label)
+					pep_submenu.append(item)
+					if not dbus_support.supported:
+						item.set_sensitive(False)
+					else:
+						activ = gajim.config.get_per('accounts', account, opt_name)
+						item.set_active(activ)
+						item.connect('toggled', func, account)
+
+				add_item(_('Publish Tune'), 'publish_tune',
+					self.on_publish_tune_toggled)
+				add_item(_('Publish Location'), 'publish_location',
+					self.on_publish_location_toggled)
 
 				pep_config = gtk.ImageMenuItem(_('Configure Services...'))
 				item = gtk.SeparatorMenuItem()
@@ -5138,10 +5080,7 @@ class RosterWindow:
 			sub_menu.append(item)
 
 			item = gtk.ImageMenuItem(_('_Change Status Message'))
-			path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png')
-			img = gtk.Image()
-			img.set_from_file(path)
-			item.set_image(img)
+			gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input')
 			sub_menu.append(item)
 			item.connect('activate', self.on_change_status_message_activate,
 				account)
@@ -5161,7 +5100,9 @@ class RosterWindow:
 		return account_context_menu
 
 	def make_account_menu(self, event, titer):
-		'''Make account's popup menu'''
+		"""
+		Make account's popup menu
+		"""
 		model = self.modelfilter
 		account = model[titer][C_ACCOUNT].decode('utf-8')
 
@@ -5193,7 +5134,9 @@ class RosterWindow:
 		menu.popup(None, None, None, event_button, event.time)
 
 	def make_group_menu(self, event, titer):
-		'''Make group's popup menu'''
+		"""
+		Make group's popup menu
+		"""
 		model = self.modelfilter
 		path = model.get_path(titer)
 		group = model[titer][C_JID].decode('utf-8')
@@ -5290,11 +5233,7 @@ class RosterWindow:
 			# Rename
 			rename_item = gtk.ImageMenuItem(_('Re_name'))
 			# add a special img for rename menuitem
-			path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-				'kbd_input.png')
-			img = gtk.Image()
-			img.set_from_file(path_to_kbd_input_img)
-			rename_item.set_image(img)
+			gtkgui_helpers.add_image_to_menuitem(rename_item, 'gajim-kbd_input')
 			menu.append(rename_item)
 			rename_item.connect('activate', self.on_rename, 'group', group,
 				account)
@@ -5350,7 +5289,9 @@ class RosterWindow:
 		menu.popup(None, None, None, event_button, event.time)
 
 	def make_contact_menu(self, event, titer):
-		'''Make contact\'s popup menu'''
+		"""
+		Make contact's popup menu
+		"""
 		model = self.modelfilter
 		jid = model[titer][C_JID].decode('utf-8')
 		tree_path = model.get_path(titer)
@@ -5362,7 +5303,9 @@ class RosterWindow:
 		menu.popup(None, None, None, event_button, event.time)
 
 	def make_multiple_contact_menu(self, event, iters):
-		'''Make group's popup menu'''
+		"""
+		Make group's popup menu
+		"""
 		model = self.modelfilter
 		list_ = [] # list of (jid, account) tuples
 		one_account_offline = False
@@ -5462,7 +5405,9 @@ class RosterWindow:
 		menu.popup(None, None, None, event_button, event.time)
 
 	def make_transport_menu(self, event, titer):
-		'''Make transport\'s popup menu'''
+		"""
+		Make transport's popup menu
+		"""
 		model = self.modelfilter
 		jid = model[titer][C_JID].decode('utf-8')
 		path = model.get_path(titer)
@@ -5546,11 +5491,7 @@ class RosterWindow:
 		# Rename
 		item = gtk.ImageMenuItem(_('_Rename'))
 		# add a special img for rename menuitem
-		path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-			'kbd_input.png')
-		img = gtk.Image()
-		img.set_from_file(path_to_kbd_input_img)
-		item.set_image(img)
+		gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input')
 		manage_transport_submenu.append(item)
 		item.connect('activate', self.on_rename, 'agent', jid, account)
 		if gajim.account_is_disconnected(account):
@@ -5649,7 +5590,9 @@ class RosterWindow:
 		menu.popup(None, None, None, event_button, event.time)
 
 	def get_and_connect_advanced_menuitem_menu(self, account):
-		'''adds FOR ACCOUNT options'''
+		"""
+		Add FOR ACCOUNT options
+		"""
 		xml = gtkgui_helpers.get_glade('advanced_menuitem_menu.glade')
 		advanced_menuitem_menu = xml.get_widget('advanced_menuitem_menu')
 
@@ -5696,8 +5639,9 @@ class RosterWindow:
 		return advanced_menuitem_menu
 
 	def add_history_manager_menuitem(self, menu):
-		'''adds a seperator and History Manager menuitem BELOW for account
-		menuitems'''
+		"""
+		Add a seperator and History Manager menuitem BELOW for account menuitems
+		"""
 		item = gtk.SeparatorMenuItem() # separator
 		menu.append(item)
 
@@ -5710,20 +5654,24 @@ class RosterWindow:
 		item.connect('activate', self.on_history_manager_menuitem_activate)
 
 	def add_bookmarks_list(self, gc_sub_menu, account):
-		'''Show join new group chat item and bookmarks list for an account'''
+		"""
+		Show join new group chat item and bookmarks list for an account
+		"""
 		item = gtk.ImageMenuItem(_('_Join New Group Chat'))
 		icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU)
 		item.set_image(icon)
 		item.connect('activate', self.on_join_gc_activate, account)
+
 		gc_sub_menu.append(item)
 
-		# user has at least one bookmark
-		if len(gajim.connections[account].bookmarks) > 0:
-			item = gtk.SeparatorMenuItem() # separator
+		# User has at least one bookmark.
+		if gajim.connections[account].bookmarks:
+			item = gtk.SeparatorMenuItem()
 			gc_sub_menu.append(item)
 
 		for bookmark in gajim.connections[account].bookmarks:
-			item = gtk.MenuItem(bookmark['name'], False) # Do not use underline
+			# Do not use underline.
+			item = gtk.MenuItem(bookmark['name'], False)
 			item.connect('activate', self.on_bookmark_menuitem_activate,
 				account, bookmark)
 			gc_sub_menu.append(item)
@@ -5771,6 +5719,15 @@ class RosterWindow:
 
 		return True
 
+	def on_ctrl_j(self, accel_group, acceleratable, keyval, modifier):
+		"""
+		Bring up the conference join dialog, when CTRL+J accelerator is being
+		activated
+		"""
+		account = gajim.connections.keys()[0]
+		self.on_join_gc_activate(None, account)
+		return True
+
 ################################################################################
 ###
 ################################################################################
@@ -5821,7 +5778,7 @@ class RosterWindow:
 		self.popups_notification_height = 0
 		self.popup_notification_windows = []
 
- 		# Remove contact from roster when last event opened
+		# Remove contact from roster when last event opened
 		# { (contact, account): { backend: boolean }
 		self.contacts_to_be_removed = {}
 		gajim.events.event_removed_subscribe(self.on_event_removed)
@@ -5862,7 +5819,7 @@ class RosterWindow:
 		# Add a Separator (self._iter_is_separator() checks on string SEPARATOR)
 		liststore.append(['SEPARATOR', None, '', True])
 
-		path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png')
+		path = gtkgui_helpers.get_icon_path('gajim-kbd_input')
 		img = gtk.Image()
 		img.set_from_file(path)
 		# sensitivity to False because by default we're offline
@@ -5917,8 +5874,7 @@ class RosterWindow:
 		def add_avatar_renderer():
 			render_pixbuf = gtk.CellRendererPixbuf() # avatar img
 			col.pack_start(render_pixbuf, expand=False)
-			col.add_attribute(render_pixbuf, 'pixbuf',
-				C_AVATAR_PIXBUF)
+			col.add_attribute(render_pixbuf, 'pixbuf', C_AVATAR_PIXBUF)
 			col.set_cell_data_func(render_pixbuf,
 				self._fill_avatar_pixbuf_renderer, None)
 
@@ -5941,19 +5897,30 @@ class RosterWindow:
 		col.pack_start(render_pixbuf, expand=False)
 		col.add_attribute(render_pixbuf, 'pixbuf', C_MOOD_PIXBUF)
 		col.set_cell_data_func(render_pixbuf,
-			self._fill_mood_pixbuf_renderer, None)
+			self._fill_pep_pixbuf_renderer, C_MOOD_PIXBUF)
 
 		render_pixbuf = gtk.CellRendererPixbuf()
 		col.pack_start(render_pixbuf, expand=False)
 		col.add_attribute(render_pixbuf, 'pixbuf', C_ACTIVITY_PIXBUF)
 		col.set_cell_data_func(render_pixbuf,
-			self._fill_activity_pixbuf_renderer, None)
+			self._fill_pep_pixbuf_renderer, C_ACTIVITY_PIXBUF)
 
 		render_pixbuf = gtk.CellRendererPixbuf()
 		col.pack_start(render_pixbuf, expand=False)
 		col.add_attribute(render_pixbuf, 'pixbuf', C_TUNE_PIXBUF)
 		col.set_cell_data_func(render_pixbuf,
-			self._fill_tune_pixbuf_renderer, None)
+			self._fill_pep_pixbuf_renderer, C_TUNE_PIXBUF)
+
+		render_pixbuf = gtk.CellRendererPixbuf()
+		col.pack_start(render_pixbuf, expand=False)
+		col.add_attribute(render_pixbuf, 'pixbuf', C_LOCATION_PIXBUF)
+		col.set_cell_data_func(render_pixbuf,
+			self._fill_pep_pixbuf_renderer, C_LOCATION_PIXBUF)
+
+		self._pep_type_to_model_column = {'mood': C_MOOD_PIXBUF,
+													 'activity': C_ACTIVITY_PIXBUF,
+													 'tune': C_TUNE_PIXBUF,
+													 'location': C_LOCATION_PIXBUF}
 
 		if gajim.config.get('avatar_position_in_roster') == 'right':
 			add_avatar_renderer()
@@ -6003,19 +5970,27 @@ class RosterWindow:
 		if gajim.config.get('show_roster_on_startup'):
 			self.window.show_all()
 		else:
-			if not gajim.config.get('trayicon') or not \
-			gajim.interface.systray_capabilities:
-				# cannot happen via GUI, but I put this incase user touches
-				# config. without trayicon, he or she should see the roster!
+			if gajim.config.get('trayicon') != 'always':
+				# Without trayicon, user should see the roster!
 				self.window.show_all()
 				gajim.config.set('show_roster_on_startup', True)
 
 		if len(gajim.connections) == 0: # if we have no account
-			gajim.interface.instances['account_creation_wizard'] = \
-				config.AccountCreationWizardWindow()
+			def _open_wizard():
+				gajim.interface.instances['account_creation_wizard'] = \
+					config.AccountCreationWizardWindow()
+			# Open wizard only after roster is created, so we can make it transient
+			# for the roster window
+			gobject.idle_add(_open_wizard)
 		if not gajim.ZEROCONF_ACC_NAME in gajim.config.get_per('accounts'):
 			# Create zeroconf in config file
 			from common.zeroconf import connection_zeroconf
 			connection_zeroconf.ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME)
 
+		# Setting CTRL+J to be the shortcut for bringing up the dialog to join a
+		# conference.
+		accel_group = gtk.accel_groups_from_object(self.window)[0]
+		accel_group.connect_group(gtk.keysyms.j, gtk.gdk.CONTROL_MASK,
+			gtk.ACCEL_MASK, self.on_ctrl_j)
+
 # vim: se ts=3:
diff --git a/src/search_window.py b/src/search_window.py
index 3a21db543..bce009207 100644
--- a/src/search_window.py
+++ b/src/search_window.py
@@ -32,8 +32,9 @@ import dataforms_widget
 
 class SearchWindow:
 	def __init__(self, account, jid):
-		'''Create new window.'''
-
+		"""
+		Create new window
+		"""
 		# an account object
 		self.account = account
 		self.jid = jid
@@ -231,5 +232,4 @@ class SearchWindow:
 			self.window.set_title('%s - Search - Gajim' % \
 				self.data_form_widget.title)
 
-
 # vim: se ts=3:
diff --git a/src/session.py b/src/session.py
index a2e911a55..e13eb0b8f 100644
--- a/src/session.py
+++ b/src/session.py
@@ -57,7 +57,9 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 		self.detach_from_control()
 
 	def get_chatstate(self, msg, msgtxt):
-		'''extracts chatstate from a <message/> stanza'''
+		"""
+		Extract chatstate from a <message/> stanza
+		"""
 		composing_xep = None
 		chatstate = None
 
@@ -83,7 +85,9 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 		return (composing_xep, chatstate)
 
 	def received(self, full_jid_with_resource, msgtxt, tim, encrypted, msg):
-		'''dispatch a received <message> stanza'''
+		"""
+		Dispatch a received <message> stanza
+		"""
 		msg_type = msg.getType()
 		subject = msg.getSubject()
 		resource = gajim.get_resource_from_jid(full_jid_with_resource)
@@ -271,9 +275,11 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 		
 
 	def roster_message(self, jid, msg, tim, encrypted=False, msg_type='',
-	subject=None, resource='', msg_id=None, user_nick='',
-	advanced_notif_num=None, xhtml=None, form_node=None):
-		'''display the message or show notification in the roster'''
+			subject=None, resource='', msg_id=None, user_nick='',
+			advanced_notif_num=None, xhtml=None, form_node=None):
+		"""
+		Display the message or show notification in the roster
+		"""
 		contact = None
 		# if chat window will be for specific resource
 		resource_for_chat = resource
diff --git a/src/statusicon.py b/src/statusicon.py
index 90bdb8c91..17bfa7b83 100644
--- a/src/statusicon.py
+++ b/src/statusicon.py
@@ -25,26 +25,73 @@
 
 import sys
 import gtk
-import systray
+import gobject
+import os
+
+import dialogs
+import config
+import tooltips
+import gtkgui_helpers
+import tooltips
 
 from common import gajim
 from common import helpers
+from common import pep
+
+class StatusIcon:
+	"""
+	Class for the notification area icon
+	"""
 
-class StatusIcon(systray.Systray):
-	'''Class for the notification area icon'''
-	#NOTE: gtk api does NOT allow:
-	# leave, enter motion notify
-	# and can't do cool tooltips we use
 	def __init__(self):
-		systray.Systray.__init__(self)
+		self.single_message_handler_id = None
+		self.new_chat_handler_id = None
+		# click somewhere else does not popdown menu. workaround this.
+		self.added_hide_menuitem = False
+		self.status = 'offline'
+		self.xml = gtkgui_helpers.get_glade('systray_context_menu.glade')
+		self.systray_context_menu = self.xml.get_widget('systray_context_menu')
+		self.xml.signal_autoconnect(self)
+		self.popup_menus = []
 		self.status_icon = None
+		self.tooltip = tooltips.NotificationAreaTooltip()
+
+	def subscribe_events(self):
+		"""
+		Register listeners to the events class
+		"""
+		gajim.events.event_added_subscribe(self.on_event_added)
+		gajim.events.event_removed_subscribe(self.on_event_removed)
+
+	def unsubscribe_events(self):
+		"""
+		Unregister listeners to the events class
+		"""
+		gajim.events.event_added_unsubscribe(self.on_event_added)
+		gajim.events.event_removed_unsubscribe(self.on_event_removed)
+
+	def on_event_added(self, event):
+		"""
+		Called when an event is added to the event list
+		"""
+		if event.show_in_systray:
+			self.set_img()
+
+	def on_event_removed(self, event_list):
+		"""
+		Called when one or more events are removed from the event list
+		"""
+		self.set_img()
 
 	def show_icon(self):
 		if not self.status_icon:
 			self.status_icon = gtk.StatusIcon()
+			self.status_icon.set_property('has-tooltip', True)
 			self.status_icon.connect('activate', self.on_status_icon_left_clicked)
 			self.status_icon.connect('popup-menu',
 				self.on_status_icon_right_clicked)
+			self.status_icon.connect('query-tooltip',
+				self.on_status_icon_query_tooltip)
 
 		self.set_img()
 		self.status_icon.set_visible(True)
@@ -53,6 +100,11 @@ class StatusIcon(systray.Systray):
 	def on_status_icon_right_clicked(self, widget, event_button, event_time):
 		self.make_menu(event_button, event_time)
 
+	def on_status_icon_query_tooltip(self, widget, x, y, keyboard_mode, tooltip):
+		self.tooltip.populate()
+		tooltip.set_custom(self.tooltip.hbox)
+		return True
+
 	def hide_icon(self):
 		self.status_icon.set_visible(False)
 		self.unsubscribe_events()
@@ -61,25 +113,321 @@ class StatusIcon(systray.Systray):
 		self.on_left_click()
 
 	def set_img(self):
-		'''apart from image, we also update tooltip text here'''
+		"""
+		Apart from image, we also update tooltip text here
+		"""
 		if not gajim.interface.systray_enabled:
 			return
-		text = helpers.get_notification_icon_tooltip_text()
-		self.status_icon.set_tooltip(text)
 		if gajim.events.get_nb_systray_events():
-			state = 'event'
 			self.status_icon.set_blinking(True)
 		else:
-			state = self.status
 			self.status_icon.set_blinking(False)
 
-		#FIXME: do not always use 16x16 (ask actually used size and use that)
-		image = gajim.interface.jabber_state_images['16'][state]
+		# FIXME: do not always use 16x16 (ask actually used size and use that)
+		image = gajim.interface.jabber_state_images['16'][self.status]
 		if image.get_storage_type() == gtk.IMAGE_PIXBUF:
 			self.status_icon.set_from_pixbuf(image.get_pixbuf())
-		#FIXME: oops they forgot to support GIF animation?
-		#or they were lazy to get it to work under Windows! WTF!
-		#elif image.get_storage_type() == gtk.IMAGE_ANIMATION:
+		# FIXME: oops they forgot to support GIF animation?
+		# or they were lazy to get it to work under Windows! WTF!
+		elif image.get_storage_type() == gtk.IMAGE_ANIMATION:
+			self.status_icon.set_from_pixbuf(
+				image.get_animation().get_static_image())
 		#	self.img_tray.set_from_animation(image.get_animation())
 
+	def change_status(self, global_status):
+		"""
+		Set tray image to 'global_status'
+		"""
+		# change image and status, only if it is different
+		if global_status is not None and self.status != global_status:
+			self.status = global_status
+		self.set_img()
+
+	def start_chat(self, widget, account, jid):
+		contact = gajim.contacts.get_first_contact_from_jid(account, jid)
+		if gajim.interface.msg_win_mgr.has_window(jid, account):
+			gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab(
+				jid, account)
+		elif contact:
+			gajim.interface.new_chat(contact, account)
+			gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab(
+				jid, account)
+
+	def on_single_message_menuitem_activate(self, widget, account):
+		dialogs.SingleMessageWindow(account, action='send')
+
+	def on_new_chat(self, widget, account):
+		dialogs.NewChatDialog(account)
+
+	def make_menu(self, event_button, event_time):
+		"""
+		Create chat with and new message (sub) menus/menuitems
+		"""
+		for m in self.popup_menus:
+			m.destroy()
+
+		chat_with_menuitem = self.xml.get_widget('chat_with_menuitem')
+		single_message_menuitem = self.xml.get_widget(
+			'single_message_menuitem')
+		status_menuitem = self.xml.get_widget('status_menu')
+		join_gc_menuitem = self.xml.get_widget('join_gc_menuitem')
+		sounds_mute_menuitem = self.xml.get_widget('sounds_mute_menuitem')
+
+		if self.single_message_handler_id:
+			single_message_menuitem.handler_disconnect(
+				self.single_message_handler_id)
+			self.single_message_handler_id = None
+		if self.new_chat_handler_id:
+			chat_with_menuitem.disconnect(self.new_chat_handler_id)
+			self.new_chat_handler_id = None
+
+		sub_menu = gtk.Menu()
+		self.popup_menus.append(sub_menu)
+		status_menuitem.set_submenu(sub_menu)
+
+		gc_sub_menu = gtk.Menu() # gc is always a submenu
+		join_gc_menuitem.set_submenu(gc_sub_menu)
+
+		# We need our own set of status icons, let's make 'em!
+		iconset = gajim.config.get('iconset')
+		path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
+		state_images = gtkgui_helpers.load_iconset(path)
+
+		if 'muc_active' in state_images:
+			join_gc_menuitem.set_image(state_images['muc_active'])
+
+		for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'):
+			uf_show = helpers.get_uf_show(show, use_mnemonic = True)
+			item = gtk.ImageMenuItem(uf_show)
+			item.set_image(state_images[show])
+			sub_menu.append(item)
+			item.connect('activate', self.on_show_menuitem_activate, show)
+
+		item = gtk.SeparatorMenuItem()
+		sub_menu.append(item)
+
+		item = gtk.ImageMenuItem(_('_Change Status Message...'))
+		gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input')
+		sub_menu.append(item)
+		item.connect('activate', self.on_change_status_message_activate)
+
+		connected_accounts = gajim.get_number_of_connected_accounts()
+		if connected_accounts < 1:
+			item.set_sensitive(False)
+
+		connected_accounts_with_private_storage = 0
+
+		item = gtk.SeparatorMenuItem()
+		sub_menu.append(item)
+
+		uf_show = helpers.get_uf_show('offline', use_mnemonic = True)
+		item = gtk.ImageMenuItem(uf_show)
+		item.set_image(state_images['offline'])
+		sub_menu.append(item)
+		item.connect('activate', self.on_show_menuitem_activate, 'offline')
+
+		iskey = connected_accounts > 0 and not (connected_accounts == 1 and
+				gajim.connections[gajim.connections.keys()[0]].is_zeroconf)
+		chat_with_menuitem.set_sensitive(iskey)
+		single_message_menuitem.set_sensitive(iskey)
+		join_gc_menuitem.set_sensitive(iskey)
+
+		accounts_list = sorted(gajim.contacts.get_accounts())
+		# items that get shown whether an account is zeroconf or not
+		if connected_accounts > 1: # 2 or more connections? make submenus
+			account_menu_for_chat_with = gtk.Menu()
+			chat_with_menuitem.set_submenu(account_menu_for_chat_with)
+			self.popup_menus.append(account_menu_for_chat_with)
+
+			for account in accounts_list:
+				if gajim.account_is_connected(account):
+					# for chat_with
+					item = gtk.MenuItem(_('using account %s') % account)
+					account_menu_for_chat_with.append(item)
+					item.connect('activate', self.on_new_chat, account)
+
+		elif connected_accounts == 1: # one account
+			# one account connected, no need to show 'as jid'
+			for account in gajim.connections:
+				if gajim.connections[account].connected > 1:
+					# for start chat
+					self.new_chat_handler_id = chat_with_menuitem.connect(
+						'activate', self.on_new_chat, account)
+					break # No other connected account
+
+		# menu items that don't apply to zeroconf connections
+		if connected_accounts == 1 or (connected_accounts == 2 and \
+		gajim.zeroconf_is_connected()):
+			# only one 'real' (non-zeroconf) account is connected, don't need
+			# submenus
+			for account in gajim.connections:
+				if gajim.account_is_connected(account) and \
+				not gajim.config.get_per('accounts', account, 'is_zeroconf'):
+					if gajim.connections[account].private_storage_supported:
+						connected_accounts_with_private_storage += 1
+
+					# for single message
+					single_message_menuitem.remove_submenu()
+					self.single_message_handler_id = single_message_menuitem.\
+						connect('activate',
+						self.on_single_message_menuitem_activate, account)
+					# join gc
+					gajim.interface.roster.add_bookmarks_list(gc_sub_menu,
+						account)
+					break # No other account connected
+		else:
+			# 2 or more 'real' accounts are connected, make submenus
+			account_menu_for_single_message = gtk.Menu()
+			single_message_menuitem.set_submenu(
+				account_menu_for_single_message)
+			self.popup_menus.append(account_menu_for_single_message)
+
+			for account in accounts_list:
+				if gajim.connections[account].is_zeroconf or \
+				not gajim.account_is_connected(account):
+					continue
+				if gajim.connections[account].private_storage_supported:
+					connected_accounts_with_private_storage += 1
+				# for single message
+				item = gtk.MenuItem(_('using account %s') % account)
+				item.connect('activate',
+					self.on_single_message_menuitem_activate, account)
+				account_menu_for_single_message.append(item)
+
+				# join gc
+				gc_item = gtk.MenuItem(_('using account %s') % account, False)
+				gc_sub_menu.append(gc_item)
+				gc_menuitem_menu = gtk.Menu()
+				gajim.interface.roster.add_bookmarks_list(gc_menuitem_menu,
+					account)
+				gc_item.set_submenu(gc_menuitem_menu)
+				gc_sub_menu.show_all()
+
+		newitem = gtk.SeparatorMenuItem() # separator
+		gc_sub_menu.append(newitem)
+		newitem = gtk.ImageMenuItem(_('_Manage Bookmarks...'))
+		img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU)
+		newitem.set_image(img)
+		newitem.connect('activate',
+			gajim.interface.roster.on_manage_bookmarks_menuitem_activate)
+		gc_sub_menu.append(newitem)
+		if connected_accounts_with_private_storage == 0:
+			newitem.set_sensitive(False)
+
+		sounds_mute_menuitem.set_active(not gajim.config.get('sounds_on'))
+
+		if os.name == 'nt':
+			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,
+			event_time)
+
+	def on_show_all_events_menuitem_activate(self, widget):
+		events = gajim.events.get_systray_events()
+		for account in events:
+			for jid in events[account]:
+				for event in events[account][jid]:
+					gajim.interface.handle_event(account, jid, event.type_)
+
+	def on_sounds_mute_menuitem_activate(self, widget):
+		gajim.config.set('sounds_on', not widget.get_active())
+		gajim.interface.save_config()
+
+	def on_show_roster_menuitem_activate(self, widget):
+		win = gajim.interface.roster.window
+		win.present()
+
+	def on_preferences_menuitem_activate(self, widget):
+		if 'preferences' in gajim.interface.instances:
+			gajim.interface.instances['preferences'].window.present()
+		else:
+			gajim.interface.instances['preferences'] = config.PreferencesWindow()
+
+	def on_quit_menuitem_activate(self, widget):
+		gajim.interface.roster.on_quit_request()
+
+	def on_left_click(self):
+		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(
+			'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.hide() # else we hide it from VD that was visible in
+			else:
+				win.show_all()
+				if not gajim.config.get('roster_window_skip_taskbar'):
+					win.set_property('skip-taskbar-hint', False)
+				win.present_with_time(gtk.get_current_event_time())
+		else:
+			self.handle_first_event()
+
+	def handle_first_event(self):
+		account, jid, event = gajim.events.get_first_systray_event()
+		if not event:
+			return
+		gajim.interface.handle_event(account, jid, event.type_)
+
+	def on_middle_click(self):
+		"""
+		Middle click raises window to have complete focus (fe. get kbd events)
+		but if already raised, it hides it
+		"""
+		win = gajim.interface.roster.window
+		if win.is_active(): # is it fully raised? (eg does it receive kbd events?)
+			win.hide()
+		else:
+			win.present()
+
+	def on_clicked(self, widget, event):
+		self.on_tray_leave_notify_event(widget, None)
+		if event.type != gtk.gdk.BUTTON_PRESS:
+			return
+		if event.button == 1: # Left click
+			self.on_left_click()
+		elif event.button == 2: # middle click
+			self.on_middle_click()
+		elif event.button == 3: # right click
+			self.make_menu(event.button, event.time)
+
+	def on_show_menuitem_activate(self, widget, show):
+		# we all add some fake (we cannot select those nor have them as show)
+		# but this helps to align with roster's status_combobox index positions
+		l = ['online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'SEPARATOR',
+			'CHANGE_STATUS_MSG_MENUITEM', 'SEPARATOR', 'offline']
+		index = l.index(show)
+		if not helpers.statuses_unified():
+			gajim.interface.roster.status_combobox.set_active(index + 2)
+			return
+		current = gajim.interface.roster.status_combobox.get_active()
+		if index != current:
+			gajim.interface.roster.status_combobox.set_active(index)
+
+	def on_change_status_message_activate(self, widget):
+		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, pep_dict):
+			if message is None: # None if user press Cancel
+				return
+			accounts = gajim.connections.keys()
+			for acct in accounts:
+				if not gajim.config.get_per('accounts', acct,
+					'sync_with_global_status'):
+					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.dialog.present()
+
 # vim: se ts=3:
diff --git a/src/systray.py b/src/systray.py
deleted file mode 100644
index e2c09331b..000000000
--- a/src/systray.py
+++ /dev/null
@@ -1,459 +0,0 @@
-# -*- coding:utf-8 -*-
-## src/systray.py
-##
-## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org>
-## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org>
-## Copyright (C) 2005 Norman Rasmussen <norman AT rasmussen.co.za>
-## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com>
-##                         Travis Shirk <travis AT pobox.com>
-## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com>
-## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de>
-## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org>
-## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net>
-##                    Julien Pivotto <roidelapluie AT gmail.com>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-
-import gtk
-import gobject
-import os
-
-import dialogs
-import config
-import tooltips
-import gtkgui_helpers
-
-from common import gajim
-from common import helpers
-from common import pep
-
-HAS_SYSTRAY_CAPABILITIES = True
-
-try:
-	import egg.trayicon as trayicon	# gnomepythonextras trayicon
-except Exception:
-	try:
-		import trayicon # our trayicon
-	except Exception:
-		gajim.log.debug('No trayicon module available')
-		HAS_SYSTRAY_CAPABILITIES = False
-
-
-class Systray:
-	'''Class for icon in the notification area
-	This class is both base class (for statusicon.py) and normal class
-	for trayicon in GNU/Linux'''
-
-	def __init__(self):
-		self.single_message_handler_id = None
-		self.new_chat_handler_id = None
-		self.t = None
-		# click somewhere else does not popdown menu. workaround this.
-		self.added_hide_menuitem = False
-		self.img_tray = gtk.Image()
-		self.status = 'offline'
-		self.xml = gtkgui_helpers.get_glade('systray_context_menu.glade')
-		self.systray_context_menu = self.xml.get_widget('systray_context_menu')
-		self.xml.signal_autoconnect(self)
-		self.popup_menus = []
-
-	def subscribe_events(self):
-		'''Register listeners to the events class'''
-		gajim.events.event_added_subscribe(self.on_event_added)
-		gajim.events.event_removed_subscribe(self.on_event_removed)
-
-	def unsubscribe_events(self):
-		'''Unregister listeners to the events class'''
-		gajim.events.event_added_unsubscribe(self.on_event_added)
-		gajim.events.event_removed_unsubscribe(self.on_event_removed)
-
-	def on_event_added(self, event):
-		'''Called when an event is added to the event list'''
-		if event.show_in_systray:
-			self.set_img()
-
-	def on_event_removed(self, event_list):
-		'''Called when one or more events are removed from the event list'''
-		self.set_img()
-
-	def set_img(self):
-		if not gajim.interface.systray_enabled:
-			return
-		if gajim.events.get_nb_systray_events():
-			state = 'event'
-		else:
-			state = self.status
-		if state != 'event' and gajim.config.get('trayicon') == 'on_event':
-			self.t.hide()
-		else:
-			self.t.show()
-		image = gajim.interface.jabber_state_images['16'][state]
-		if image.get_storage_type() == gtk.IMAGE_ANIMATION:
-			self.img_tray.set_from_animation(image.get_animation())
-		elif image.get_storage_type() == gtk.IMAGE_PIXBUF:
-			self.img_tray.set_from_pixbuf(image.get_pixbuf())
-
-	def change_status(self, global_status):
-		''' set tray image to 'global_status' '''
-		# change image and status, only if it is different
-		if global_status is not None and self.status != global_status:
-			self.status = global_status
-		self.set_img()
-
-	def start_chat(self, widget, account, jid):
-		contact = gajim.contacts.get_first_contact_from_jid(account, jid)
-		if gajim.interface.msg_win_mgr.has_window(jid, account):
-			gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab(
-				jid, account)
-		elif contact:
-			gajim.interface.new_chat(contact, account)
-			gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab(
-				jid, account)
-
-	def on_single_message_menuitem_activate(self, widget, account):
-		dialogs.SingleMessageWindow(account, action = 'send')
-
-	def on_new_chat(self, widget, account):
-		dialogs.NewChatDialog(account)
-
-	def make_menu(self, event_button, event_time):
-		'''create chat with and new message (sub) menus/menuitems'''
-		for m in self.popup_menus:
-			m.destroy()
-
-		chat_with_menuitem = self.xml.get_widget('chat_with_menuitem')
-		single_message_menuitem = self.xml.get_widget(
-			'single_message_menuitem')
-		status_menuitem = self.xml.get_widget('status_menu')
-		join_gc_menuitem = self.xml.get_widget('join_gc_menuitem')
-		sounds_mute_menuitem = self.xml.get_widget('sounds_mute_menuitem')
-
-		if self.single_message_handler_id:
-			single_message_menuitem.handler_disconnect(
-				self.single_message_handler_id)
-			self.single_message_handler_id = None
-		if self.new_chat_handler_id:
-			chat_with_menuitem.disconnect(self.new_chat_handler_id)
-			self.new_chat_handler_id = None
-
-		sub_menu = gtk.Menu()
-		self.popup_menus.append(sub_menu)
-		status_menuitem.set_submenu(sub_menu)
-
-		gc_sub_menu = gtk.Menu() # gc is always a submenu
-		join_gc_menuitem.set_submenu(gc_sub_menu)
-
-		# We need our own set of status icons, let's make 'em!
-		iconset = gajim.config.get('iconset')
-		path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
-		state_images = gtkgui_helpers.load_iconset(path)
-
-		if 'muc_active' in state_images:
-			join_gc_menuitem.set_image(state_images['muc_active'])
-
-		for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'):
-			uf_show = helpers.get_uf_show(show, use_mnemonic = True)
-			item = gtk.ImageMenuItem(uf_show)
-			item.set_image(state_images[show])
-			sub_menu.append(item)
-			item.connect('activate', self.on_show_menuitem_activate, show)
-
-		item = gtk.SeparatorMenuItem()
-		sub_menu.append(item)
-
-		item = gtk.ImageMenuItem(_('_Change Status Message...'))
-		path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png')
-		img = gtk.Image()
-		img.set_from_file(path)
-		item.set_image(img)
-		sub_menu.append(item)
-		item.connect('activate', self.on_change_status_message_activate)
-
-		connected_accounts = gajim.get_number_of_connected_accounts()
-		if connected_accounts < 1:
-			item.set_sensitive(False)
-
-		connected_accounts_with_private_storage = 0
-
-		item = gtk.SeparatorMenuItem()
-		sub_menu.append(item)
-
-		uf_show = helpers.get_uf_show('offline', use_mnemonic = True)
-		item = gtk.ImageMenuItem(uf_show)
-		item.set_image(state_images['offline'])
-		sub_menu.append(item)
-		item.connect('activate', self.on_show_menuitem_activate, 'offline')
-
-		iskey = connected_accounts > 0 and not (connected_accounts == 1 and
-				gajim.connections[gajim.connections.keys()[0]].is_zeroconf)
-		chat_with_menuitem.set_sensitive(iskey)
-		single_message_menuitem.set_sensitive(iskey)
-		join_gc_menuitem.set_sensitive(iskey)
-
-		accounts_list = sorted(gajim.contacts.get_accounts())
-		# items that get shown whether an account is zeroconf or not
-		if connected_accounts > 1: # 2 or more connections? make submenus
-			account_menu_for_chat_with = gtk.Menu()
-			chat_with_menuitem.set_submenu(account_menu_for_chat_with)
-			self.popup_menus.append(account_menu_for_chat_with)
-
-			for account in accounts_list:
-				if gajim.account_is_connected(account):
-					# for chat_with
-					item = gtk.MenuItem(_('using account %s') % account)
-					account_menu_for_chat_with.append(item)
-					item.connect('activate', self.on_new_chat, account)
-
-		elif connected_accounts == 1: # one account
-			# one account connected, no need to show 'as jid'
-			for account in gajim.connections:
-				if gajim.connections[account].connected > 1:
-					# for start chat
-					self.new_chat_handler_id = chat_with_menuitem.connect(
-						'activate', self.on_new_chat, account)
-					break # No other connected account
-
-		# menu items that don't apply to zeroconf connections
-		if connected_accounts == 1 or (connected_accounts == 2 and \
-		gajim.zeroconf_is_connected()):
-			# only one 'real' (non-zeroconf) account is connected, don't need
-			# submenus
-			for account in gajim.connections:
-				if gajim.account_is_connected(account) and \
-				not gajim.config.get_per('accounts', account, 'is_zeroconf'):
-					if gajim.connections[account].private_storage_supported:
-						connected_accounts_with_private_storage += 1
-
-					# for single message
-					single_message_menuitem.remove_submenu()
-					self.single_message_handler_id = single_message_menuitem.\
-						connect('activate',
-						self.on_single_message_menuitem_activate, account)
-					# join gc
-					gajim.interface.roster.add_bookmarks_list(gc_sub_menu,
-						account)
-					break # No other account connected
-		else:
-			# 2 or more 'real' accounts are connected, make submenus
-			account_menu_for_single_message = gtk.Menu()
-			single_message_menuitem.set_submenu(
-				account_menu_for_single_message)
-			self.popup_menus.append(account_menu_for_single_message)
-
-			for account in accounts_list:
-				if gajim.connections[account].is_zeroconf or \
-				not gajim.account_is_connected(account):
-					continue
-				if gajim.connections[account].private_storage_supported:
-					connected_accounts_with_private_storage += 1
-				# for single message
-				item = gtk.MenuItem(_('using account %s') % account)
-				item.connect('activate',
-					self.on_single_message_menuitem_activate, account)
-				account_menu_for_single_message.append(item)
-
-				# join gc
-				gc_item = gtk.MenuItem(_('using account %s') % account, False)
-				gc_sub_menu.append(gc_item)
-				gc_menuitem_menu = gtk.Menu()
-				gajim.interface.roster.add_bookmarks_list(gc_menuitem_menu,
-					account)
-				gc_item.set_submenu(gc_menuitem_menu)
-				gc_sub_menu.show_all()
-
-		newitem = gtk.SeparatorMenuItem() # separator
-		gc_sub_menu.append(newitem)
-		newitem = gtk.ImageMenuItem(_('_Manage Bookmarks...'))
-		img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU)
-		newitem.set_image(img)
-		newitem.connect('activate',
-			gajim.interface.roster.on_manage_bookmarks_menuitem_activate)
-		gc_sub_menu.append(newitem)
-		if connected_accounts_with_private_storage == 0:
-			newitem.set_sensitive(False)
-
-		sounds_mute_menuitem.set_active(not gajim.config.get('sounds_on'))
-
-		if os.name == 'nt':
-			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,
-			event_time)
-
-	def on_show_all_events_menuitem_activate(self, widget):
-		events = gajim.events.get_systray_events()
-		for account in events:
-			for jid in events[account]:
-				for event in events[account][jid]:
-					gajim.interface.handle_event(account, jid, event.type_)
-
-	def on_sounds_mute_menuitem_activate(self, widget):
-		gajim.config.set('sounds_on', not widget.get_active())
-		gajim.interface.save_config()
-
-	def on_show_roster_menuitem_activate(self, widget):
-		win = gajim.interface.roster.window
-		win.present()
-
-	def on_preferences_menuitem_activate(self, widget):
-		if 'preferences' in gajim.interface.instances:
-			gajim.interface.instances['preferences'].window.present()
-		else:
-			gajim.interface.instances['preferences'] = config.PreferencesWindow()
-
-	def on_quit_menuitem_activate(self, widget):
-		gajim.interface.roster.on_quit_request()
-
-	def on_left_click(self):
-		win = gajim.interface.roster.window
-		if len(gajim.events.get_systray_events()) == 0:
-			# No pending events, so toggle visible/hidden for roster window
-			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:
-				win.deiconify()
-				if not gajim.config.get('roster_window_skip_taskbar'):
-					win.set_property('skip-taskbar-hint', False)
-				win.present_with_time(gtk.get_current_event_time())
-		else:
-			self.handle_first_event()
-
-	def handle_first_event(self):
-		account, jid, event = gajim.events.get_first_systray_event()
-		if not event:
-			return
-		gajim.interface.handle_event(account, jid, event.type_)
-
-	def on_middle_click(self):
-		'''middle click raises window to have complete focus (fe. get kbd events)
-		but if already raised, it hides it'''
-		win = gajim.interface.roster.window
-		if win.is_active(): # is it fully raised? (eg does it receive kbd events?)
-			win.hide()
-		else:
-			win.present()
-
-	def on_clicked(self, widget, event):
-		self.on_tray_leave_notify_event(widget, None)
-		if event.type != gtk.gdk.BUTTON_PRESS:
-			return
-		if event.button == 1: # Left click
-			self.on_left_click()
-		elif event.button == 2: # middle click
-			self.on_middle_click()
-		elif event.button == 3: # right click
-			self.make_menu(event.button, event.time)
-
-	def on_show_menuitem_activate(self, widget, show):
-		# we all add some fake (we cannot select those nor have them as show)
-		# but this helps to align with roster's status_combobox index positions
-		l = ['online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'SEPARATOR',
-			'CHANGE_STATUS_MSG_MENUITEM', 'SEPARATOR', 'offline']
-		index = l.index(show)
-		if not helpers.statuses_unified():
-			gajim.interface.roster.status_combobox.set_active(index + 2)
-			return
-		current = gajim.interface.roster.status_combobox.get_active()
-		if index != current:
-			gajim.interface.roster.status_combobox.set_active(index)
-
-	def on_change_status_message_activate(self, widget):
-		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, pep_dict):
-			if message is None: # None if user press Cancel
-				return
-			accounts = gajim.connections.keys()
-			for acct in accounts:
-				if not gajim.config.get_per('accounts', acct,
-					'sync_with_global_status'):
-					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.dialog.present()
-
-	def show_tooltip(self, widget):
-		position = widget.window.get_origin()
-		if self.tooltip.id == position:
-			size = widget.window.get_size()
-			self.tooltip.show_tooltip('', size[1], position[1])
-
-	def on_tray_motion_notify_event(self, widget, event):
-		position = widget.window.get_origin()
-		if self.tooltip.timeout > 0:
-			if self.tooltip.id != position:
-				self.tooltip.hide_tooltip()
-		if self.tooltip.timeout == 0 and \
-			self.tooltip.id != position:
-			self.tooltip.id = position
-			self.tooltip.timeout = gobject.timeout_add(500,
-				self.show_tooltip, widget)
-
-	def on_tray_leave_notify_event(self, widget, event):
-		position = widget.window.get_origin()
-		if self.tooltip.timeout > 0 and \
-			self.tooltip.id == position:
-			self.tooltip.hide_tooltip()
-
-	def on_tray_destroyed(self, widget):
-		'''re-add trayicon when systray is destroyed'''
-		self.t = None
-		if gajim.interface.systray_enabled:
-			self.show_icon()
-
-	def show_icon(self):
-		if not self.t:
-			self.t = trayicon.TrayIcon('Gajim')
-			self.t.connect('destroy', self.on_tray_destroyed)
-			eb = gtk.EventBox()
-			# avoid draw seperate bg color in some gtk themes
-			eb.set_visible_window(False)
-			eb.set_events(gtk.gdk.POINTER_MOTION_MASK)
-			eb.connect('button-press-event', self.on_clicked)
-			eb.connect('motion-notify-event', self.on_tray_motion_notify_event)
-			eb.connect('leave-notify-event', self.on_tray_leave_notify_event)
-			self.tooltip = tooltips.NotificationAreaTooltip()
-
-			self.img_tray = gtk.Image()
-			eb.add(self.img_tray)
-			self.t.add(eb)
-			self.set_img()
-			self.subscribe_events()
-		self.t.show_all()
-
-	def hide_icon(self):
-		if self.t:
-			self.t.destroy()
-			self.t = None
-			self.unsubscribe_events()
-
-# vim: se ts=3:
diff --git a/src/tooltips.py b/src/tooltips.py
index fa96cbd8c..aeaf06b1c 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -41,7 +41,9 @@ from common import helpers
 from common.pep import MOODS, ACTIVITIES
 
 class BaseTooltip:
-	''' Base Tooltip class;
+	"""
+	Base Tooltip class
+
 		Usage:
 			tooltip = BaseTooltip()
 			....
@@ -57,22 +59,28 @@ class BaseTooltip:
 
 		Tooltip is displayed aligned centered to the mouse poiner and 4px below the widget.
 		In case tooltip goes below the visible area it is shown above the widget.
-	'''
+	"""
+
 	def __init__(self):
 		self.timeout = 0
 		self.preferred_position = [0, 0]
 		self.win = None
 		self.id = None
+		self.cur_data = None
+		self.check_last_time = None
 
 	def populate(self, data):
-		''' this method must be overriden by all extenders
-		This is the most simple implementation: show data as value of a label
-		'''
+		"""
+		This method must be overriden by all extenders. This is the most simple
+		implementation: show data as value of a label
+		"""
 		self.create_window()
 		self.win.add(gtk.Label(data))
 
 	def create_window(self):
-		''' create a popup window each time tooltip is requested '''
+		"""
+		Create a popup window each time tooltip is requested
+		"""
 		self.win = gtk.Window(gtk.WINDOW_POPUP)
 		self.win.set_border_width(3)
 		self.win.set_resizable(False)
@@ -86,10 +94,12 @@ class BaseTooltip:
 		self.screen = self.win.get_screen()
 
 	def _get_icon_name_for_tooltip(self, contact):
-		''' helper function used for tooltip contacts/acounts
+		"""
+		Helper function used for tooltip contacts/acounts
+
 		Tooltip on account has fake contact with sub == '', in this case we show
 		real status of the account
-		'''
+		"""
 		if contact.ask == 'subscribe':
 			return 'requested'
 		elif contact.sub in ('both', 'to', ''):
@@ -107,9 +117,8 @@ class BaseTooltip:
 			self.screen.get_width() + half_width:
 			self.preferred_position[0] = self.screen.get_width() - \
 				requisition.width
-		else:
+		elif not self.check_last_time:
 			self.preferred_position[0] -= half_width
-			self.screen.get_height()
 		if self.preferred_position[1] + requisition.height > \
 			self.screen.get_height():
 			# flip tooltip up
@@ -133,11 +142,14 @@ class BaseTooltip:
 		return True
 
 	def show_tooltip(self, data, widget_height, widget_y_position):
-		''' show tooltip on widget.
-		data contains needed data for tooltip contents
-		widget_height is the height of the widget on which we show the tooltip
-		widget_y_position is vertical position of the widget on the screen
-		'''
+		"""
+		Show tooltip on widget
+
+		Data contains needed data for tooltip contents.
+		widget_height is the height of the widget on which we show the tooltip.
+		widget_y_position is vertical position of the widget on the screen.
+		"""
+		self.cur_data = data
 		# set tooltip contents
 		self.populate(data)
 
@@ -161,10 +173,15 @@ class BaseTooltip:
 			self.win.destroy()
 			self.win = None
 		self.id = None
+		self.cur_data = None
+		self.check_last_time = None
 
 class StatusTable:
-	''' Contains methods for creating status table. This
-	is used in Roster and NotificationArea tooltips	'''
+	"""
+	Contains methods for creating status table. This is used in Roster and
+	NotificationArea tooltips
+	"""
+
 	def __init__(self):
 		self.current_row = 1
 		self.table = None
@@ -201,8 +218,10 @@ class StatusTable:
 		return str_status
 
 	def add_status_row(self, file_path, show, str_status, status_time=None,
-	show_lock=False, indent=True):
-		''' appends a new row with status icon to the table '''
+			show_lock=False, indent=True):
+		"""
+		Append a new row with status icon to the table
+		"""
 		self.current_row += 1
 		state_file = show.replace(' ', '_')
 		files = []
@@ -235,7 +254,10 @@ class StatusTable:
 				self.current_row + 1, 0, 0, 0, 0)
 
 class NotificationAreaTooltip(BaseTooltip, StatusTable):
-	''' Tooltip that is shown in the notification area '''
+	"""
+	Tooltip that is shown in the notification area
+	"""
+
 	def __init__(self):
 		BaseTooltip.__init__(self)
 		StatusTable.__init__(self)
@@ -269,7 +291,7 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable):
 			for line in acct['event_lines']:
 				self.add_text_row('  ' + line, 1)
 
-	def populate(self, data):
+	def populate(self, data=''):
 		self.create_window()
 		self.create_table()
 
@@ -280,10 +302,13 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable):
 		self.table.set_property('column-spacing', 1)
 
 		self.hbox.add(self.table)
-		self.win.add(self.hbox)
+		self.hbox.show_all()
 
 class GCTooltip(BaseTooltip):
-	''' Tooltip that is shown in the GC treeview '''
+	"""
+	Tooltip that is shown in the GC treeview
+	"""
+
 	def __init__(self):
 		self.account = None
 		self.text_label = gtk.Label()
@@ -378,7 +403,10 @@ class GCTooltip(BaseTooltip):
 		self.win.add(vcard_table)
 
 class RosterTooltip(NotificationAreaTooltip):
-	''' Tooltip that is shown in the roster treeview '''
+	"""
+	Tooltip that is shown in the roster treeview
+	"""
+
 	def __init__(self):
 		self.account = None
 		self.image = gtk.Image()
@@ -474,6 +502,20 @@ class RosterTooltip(NotificationAreaTooltip):
 		else: # only one resource
 			if contact.show:
 				show = helpers.get_uf_show(contact.show)
+				if not self.check_last_time and self.account:
+					if contact.show == 'offline':
+						if not contact.last_status_time:
+							gajim.connections[self.account].request_last_status_time(
+								contact.jid, '')
+						else:
+							self.check_last_time = contact.last_status_time
+					elif contact.resource:
+						gajim.connections[self.account].request_last_status_time(
+							contact.jid, contact.resource)
+						if contact.last_activity_time:
+							self.check_last_time = contact.last_activity_time
+				else:
+					self.check_last_time = None
 				if contact.last_status_time:
 					vcard_current_row += 1
 					if contact.show == 'offline':
@@ -541,6 +583,23 @@ class RosterTooltip(NotificationAreaTooltip):
 				properties.append((_('OpenPGP: '),
 					gobject.markup_escape_text(keyID)))
 
+		if contact.last_activity_time:
+			text = _(' since %s')
+
+			if time.strftime('%j', time.localtime())== \
+					time.strftime('%j', contact.last_activity_time):
+			# it's today, show only the locale hour representation
+				local_time = time.strftime('%I:%M %p',
+					contact.last_activity_time)
+			else:
+				# time.strftime returns locale encoded string
+				local_time = time.strftime('%c',
+					contact.last_activity_time)
+			local_time = local_time.decode(
+				locale.getpreferredencoding())
+			text = text % local_time
+			properties.append(('Idle' + text,None))
+
 		while properties:
 			property_ = properties.pop(0)
 			vcard_current_row += 1
@@ -561,7 +620,7 @@ class RosterTooltip(NotificationAreaTooltip):
 					vcard_current_row + 1, gtk.EXPAND | gtk.FILL,
 						vertical_fill, 0, 0)
 			else:
-				if isinstance(property_[0], (unicode, str)): #FIXME: rm unicode?
+				if isinstance(property_[0], (unicode, str)): # FIXME: rm unicode?
 					label.set_markup(property_[0])
 					label.set_line_wrap(True)
 				else:
@@ -574,75 +633,46 @@ class RosterTooltip(NotificationAreaTooltip):
 				vcard_current_row + 1, gtk.FILL, gtk.FILL | gtk.EXPAND, 3, 3)
 		self.win.add(vcard_table)
 
+	def update_last_time(self, last_time):
+		if not self.check_last_time or time.strftime('%x %I:%M %p', last_time) !=\
+		time.strftime('%x %I:%M %p', self.check_last_time):
+			self.win.destroy()
+			self.win = None
+			self.populate(self.cur_data)
+			self.win.ensure_style()
+			self.win.show_all()
+
 	def _append_pep_info(self, contact, properties):
-		'''
-		Append Tune, Mood, Activity information of the specified contact
+		"""
+		Append Tune, Mood, Activity, Location information of the specified contact
 		to the given property list.
-		'''
-		if 'mood' in contact.mood:
-			mood = contact.mood['mood'].strip()
-			mood = MOODS.get(mood, mood)
-			mood = gobject.markup_escape_text(mood)
-			mood_string = _('Mood:') + ' <b>%s</b>' % mood
-			if 'text' in contact.mood \
-			and contact.mood['text'] != '':
-				mood_text = contact.mood['text'].strip()
-				mood_text = \
-					gobject.markup_escape_text(mood_text)
-				mood_string += ' (%s)' % mood_text
+		"""
+		if 'mood' in contact.pep:
+			mood = contact.pep['mood'].asMarkupText()
+			mood_string = _('Mood:') + ' %s' % mood
 			properties.append((mood_string, None))
 
-		if 'activity' in contact.activity:
-			activity = act_plain = \
-				contact.activity['activity'].strip()
-			activity = gobject.markup_escape_text(activity)
-			if act_plain in ACTIVITIES:
-				activity = ACTIVITIES[activity]['category']
-			activity_string = _('Activity:') + ' <b>%s' % activity
-			if 'subactivity' in contact.activity:
-				activity_sub = \
-					contact.activity['subactivity'].strip()
-				if act_plain in ACTIVITIES and activity_sub in \
-				ACTIVITIES[act_plain]:
-					activity_sub = ACTIVITIES[act_plain][activity_sub]
-				activity_sub = \
-					gobject.markup_escape_text(activity_sub)
-				activity_string += ': %s</b>' % activity_sub
-			else:
-				activity_string += '</b>'
-			if 'text' in contact.activity:
-				activity_text = contact.activity['text'].strip()
-				activity_text = gobject.markup_escape_text(
-					activity_text)
-				activity_string += ' (%s)' % activity_text
+		if 'activity' in contact.pep:
+			activity = contact.pep['activity'].asMarkupText()
+			activity_string = _('Activity:') + ' %s' % activity
 			properties.append((activity_string, None))
 
-		if 'artist' in contact.tune \
-		or 'title' in contact.tune:
-			if 'artist' in contact.tune:
-				artist = contact.tune['artist'].strip()
-				artist = gobject.markup_escape_text(artist)
-			else:
-				artist = _('Unknown Artist')
-			if 'title' in contact.tune:
-				title = contact.tune['title'].strip()
-				title = gobject.markup_escape_text(title)
-			else:
-				title = _('Unknown Title')
-			if 'source' in contact.tune:
-				source = contact.tune['source'].strip()
-				source = gobject.markup_escape_text(source)
-			else:
-				source = _('Unknown Source')
-			tune_string = _('Tune:') + ' ' + \
-				_('<b>"%(title)s"</b> by <i>%(artist)s</i>\n'
-				'from <i>%(source)s</i>') % {'title': title,
-				'artist': artist, 'source': source}
+		if 'tune' in contact.pep:
+			tune = contact.pep['tune'].asMarkupText()
+			tune_string = _('Tune:') + ' %s' % tune
 			properties.append((tune_string, None))
 
+		if 'location' in contact.pep:
+			location = contact.pep['location'].asMarkupText()
+			location_string = _('Location:') + ' %s' % location
+			properties.append((location_string, None))
+
 
 class FileTransfersTooltip(BaseTooltip):
-	''' Tooltip that is shown in the notification area '''
+	"""
+	Tooltip that is shown in the notification area
+	"""
+
 	def __init__(self):
 		BaseTooltip.__init__(self)
 
@@ -726,7 +756,9 @@ class FileTransfersTooltip(BaseTooltip):
 
 
 class ServiceDiscoveryTooltip(BaseTooltip):
-	''' Tooltip that is shown when hovering over a service discovery row '''
+	"""
+	Tooltip that is shown when hovering over a service discovery row
+	"""
 	def populate(self, status):
 		self.create_window()
 		label = gtk.Label()
diff --git a/src/trayicon.defs b/src/trayicon.defs
deleted file mode 100644
index 6d253cf83..000000000
--- a/src/trayicon.defs
+++ /dev/null
@@ -1,59 +0,0 @@
-;; -*- scheme -*-
-
-; object definitions ...
-(define-object TrayIcon
-  (in-module "Egg")
-  (parent "GtkPlug")
-  (c-name "EggTrayIcon")
-  (gtype-id "EGG_TYPE_TRAY_ICON")
-)
-
-;; Enumerations and flags ...
-
-
-;; From eggtrayicon.h
-
-(define-function egg_tray_icon_get_type
-  (c-name "egg_tray_icon_get_type")
-  (return-type "GType")
-)
-
-(define-function egg_tray_icon_new_for_screen
-  (c-name "egg_tray_icon_new_for_screen")
-  (return-type "EggTrayIcon*")
-  (parameters
-    '("GdkScreen*" "screen")
-    '("const-gchar*" "name")
-  )
-)
-
-(define-function egg_tray_icon_new
-  (c-name "egg_tray_icon_new")
-  (is-constructor-of "EggTrayIcon")
-  (return-type "EggTrayIcon*")
-  (parameters
-    '("const-gchar*" "name")
-  )
-)
-
-(define-method send_message
-  (of-object "EggTrayIcon")
-  (c-name "egg_tray_icon_send_message")
-  (return-type "guint")
-  (parameters
-    '("gint" "timeout")
-    '("const-char*" "message")
-    '("gint" "len")
-  )
-)
-
-(define-method cancel_message
-  (of-object "EggTrayIcon")
-  (c-name "egg_tray_icon_cancel_message")
-  (return-type "none")
-  (parameters
-    '("guint" "id")
-  )
-)
-
-
diff --git a/src/trayicon.override b/src/trayicon.override
deleted file mode 100644
index 75bd7ed8f..000000000
--- a/src/trayicon.override
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * src/trayicon.override
- *
- * Copyright (C) 2004-2005 Yann Leboulanger <asterix AT lagaule.org>
- *
- * This file is part of Gajim.
- *
- * Gajim is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; version 3 only.
- *
- * Gajim is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Gajim. If not, see <http://www.gnu.org/licenses/>.
- */
-%%
-headers
-#include <Python.h>
-
-#include "pygobject.h"
-#include "eggtrayicon.h"
-%%
-modulename trayicon
-%%
-import gtk.Plug as PyGtkPlug_Type
-import gtk.gdk.Screen as PyGdkScreen_Type
-%%
-ignore-glob
-  *_get_type
-%%
-override egg_tray_icon_send_message kwargs
-static PyObject*
-_wrap_egg_tray_icon_send_message(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = {"timeout", "message", NULL};
-    int timeout, len, ret;
-    char *message;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "is#:TrayIcon.send_message", kwlist, &timeout, &message, &len))
-        return NULL;
-    ret = egg_tray_icon_send_message(EGG_TRAY_ICON(self->obj), timeout, message, len);
-    return PyInt_FromLong(ret);
-}
diff --git a/src/trayiconmodule.c b/src/trayiconmodule.c
deleted file mode 100644
index 7a2b1206f..000000000
--- a/src/trayiconmodule.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * src/trayiconmodule.c
- *
- * Copyright (C) 2004-2005 Yann Leboulanger <asterix AT lagaule.org>
- *
- * This file is part of Gajim.
- *
- * Gajim is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; version 3 only.
- *
- * Gajim is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Gajim. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* include this first, before NO_IMPORT_PYGOBJECT is defined */
-#include <pygobject.h>
-
-void trayicon_register_classes (PyObject *d);
-
-extern PyMethodDef trayicon_functions[];
-
-DL_EXPORT(void)
-inittrayicon(void)
-{
-    PyObject *m, *d;
-
-    init_pygobject ();
-
-    m = Py_InitModule ("trayicon", trayicon_functions);
-    d = PyModule_GetDict (m);
-
-    trayicon_register_classes (d);
-
-    if (PyErr_Occurred ()) {
-	Py_FatalError ("can't initialise module trayicon :(");
-    }
-}
diff --git a/src/vcard.py b/src/vcard.py
index 5ee86044b..b2f8fd084 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -45,8 +45,11 @@ from common import gajim
 from common.i18n import Q_
 
 def get_avatar_pixbuf_encoded_mime(photo):
-	'''return the pixbuf of the image
-	photo is a dictionary containing PHOTO information'''
+	"""
+	Return the pixbuf of the image
+
+	Photo is a dictionary containing PHOTO information.
+	"""
 	if not isinstance(photo, dict):
 		return None, None, None
 	img_decoded = None
@@ -71,7 +74,9 @@ def get_avatar_pixbuf_encoded_mime(photo):
 	return pixbuf, avatar_encoded, avatar_mime_type
 
 class VcardWindow:
-	'''Class for contact's information window'''
+	"""
+	Class for contact's information window
+	"""
 
 	def __init__(self, contact, account, gc_contact = None):
 		# the contact variable is the jid if vcard is true
@@ -151,14 +156,15 @@ class VcardWindow:
 			self.window.destroy()
 
 	def on_PHOTO_eventbox_button_press_event(self, widget, event):
-		'''If right-clicked, show popup'''
+		"""
+		If right-clicked, show popup
+		"""
 		if event.button == 3: # right click
 			menu = gtk.Menu()
 			menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS)
 			menuitem.connect('activate',
 				gtkgui_helpers.on_avatar_save_as_menuitem_activate,
-				self.contact.jid, self.account, self.contact.get_shown_name() +
-				'.jpeg')
+				self.contact.jid, self.account, self.contact.get_shown_name())
 			menu.append(menuitem)
 			menu.connect('selection-done', lambda w:w.destroy())
 			# show the menu
@@ -465,14 +471,15 @@ class ZeroconfVcardWindow:
 			self.window.destroy()
 
 	def on_PHOTO_eventbox_button_press_event(self, widget, event):
-		'''If right-clicked, show popup'''
+		"""
+		If right-clicked, show popup
+		"""
 		if event.button == 3: # right click
 			menu = gtk.Menu()
 			menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS)
 			menuitem.connect('activate',
 				gtkgui_helpers.on_avatar_save_as_menuitem_activate,
-				self.contact.jid, self.account, self.contact.get_shown_name() +
-				'.jpeg')
+				self.contact.jid, self.account, self.contact.get_shown_name())
 			menu.append(menuitem)
 			menu.connect('selection-done', lambda w:w.destroy())
 			# show the menu
@@ -534,10 +541,6 @@ class ZeroconfVcardWindow:
 		if not self.contact.status:
 			self.contact.status = ''
 
-		# Request list time status
-	#	gajim.connections[self.account].request_last_status_time(self.contact.jid,
-	#		self.contact.resource)
-
 		self.xml.get_widget('resource_prio_label').set_text(resources)
 		resource_prio_label_eventbox = self.xml.get_widget(
 			'resource_prio_label_eventbox')
@@ -545,8 +548,6 @@ class ZeroconfVcardWindow:
 
 		self.fill_status_label()
 
-	#	gajim.connections[self.account].request_vcard(self.contact.jid, self.is_fake)
-
 	def fill_personal_page(self):
 		contact = gajim.connections[gajim.ZEROCONF_ACC_NAME].roster.getItem(self.contact.jid)
 		for key in ('1st', 'last', 'jid', 'email'):
diff --git a/test/integration/test_gui_event_integration.py b/test/integration/test_gui_event_integration.py
index 8759e2259..a1eadea60 100644
--- a/test/integration/test_gui_event_integration.py
+++ b/test/integration/test_gui_event_integration.py
@@ -28,7 +28,7 @@ class TestStatusChange(unittest.TestCase):
 	def setUp(self):
 		
 		gajim.connections = {}
-		gajim.contacts = contacts_module.Contacts()
+		gajim.contacts = contacts_module.LegacyContactsAPI()
 		gajim.interface.roster = roster_window.RosterWindow()
 
 		for acc in contacts:
diff --git a/test/integration/test_roster.py b/test/integration/test_roster.py
index acb91b71c..0be85aa11 100644
--- a/test/integration/test_roster.py
+++ b/test/integration/test_roster.py
@@ -27,7 +27,7 @@ class TestRosterWindow(unittest.TestCase):
 
 		# Add after creating RosterWindow
 		# We want to test the filling explicitly
-		gajim.contacts = contacts_module.Contacts()
+		gajim.contacts = contacts_module.LegacyContactsAPI()
 		gajim.connections = {}
 		self.roster = roster_window.RosterWindow()
 		
diff --git a/test/integration/test_xmpp_transports_nb.py b/test/integration/test_xmpp_transports_nb.py
index 6e56ddf94..ef9908903 100644
--- a/test/integration/test_xmpp_transports_nb.py
+++ b/test/integration/test_xmpp_transports_nb.py
@@ -254,12 +254,12 @@ class TestNonBlockingHTTP(AbstractTransportTest):
 	def test_receive_http_message_in_chunks(self):
 		''' Let _on_receive handle some chunked http messages  '''
 		transport = self._get_transport(self.bosh_http_dict)
-		
-		header = ("HTTP/1.1 200 OK\r\nContent-Type: text/xml; charset=utf-8\r\n" +
-			"Content-Length: 88\r\n\r\n")
-		payload = "<test>Please don't fail!</test>"
+
+		payload = "<test>Please don't fail!\n\n</test>"
 		body = "<body xmlns='http://jabber.org/protocol/httpbind'>%s</body>" \
 			% payload
+		header = "HTTP/1.1 200 OK\r\nContent-Type: text/xml; charset=utf-8\r\n" +\
+			"Content-Length: %i\r\n\r\n" % len(body)
 		message = "%s%s" % (header, body)
 
 		chunk1, chunk2, chunk3, chunk4  = message[:20], message[20:73], \
diff --git a/test/lib/gajim_mocks.py b/test/lib/gajim_mocks.py
index d45e488e6..9607a77c9 100644
--- a/test/lib/gajim_mocks.py
+++ b/test/lib/gajim_mocks.py
@@ -14,9 +14,7 @@ class MockConnection(Mock, ConnectionHandlersBase):
 
 		self.name = account
 		self.connected = 2
-		self.mood = {}
-		self.activity = {}
-		self.tune = {}
+		self.pep = {}
 		self.blocked_contacts = {}
 		self.blocked_groups = {}
 		self.sessions = {}
diff --git a/test/runtests.py b/test/runtests.py
index 4f8ebea30..6bca37228 100755
--- a/test/runtests.py
+++ b/test/runtests.py
@@ -37,11 +37,12 @@ for o, a in opts:
 # new test modules need to be added manually
 modules = ( 'unit.test_xmpp_dispatcher_nb',
 				'unit.test_xmpp_transports_nb',
-				'unit.test_caps',
+				'unit.test_protocol_caps',
+				'unit.test_caps_cache',
 				'unit.test_contacts',
-				'unit.test_gui_interface',
 				'unit.test_sessions',
 				'unit.test_account',
+				'unit.test_gui_interface',
 			 )
 #modules = ()
 
diff --git a/test/unit/test_caps.py b/test/unit/test_caps_cache.py
index a143f225c..bb6069bc0 100644
--- a/test/unit/test_caps.py
+++ b/test/unit/test_caps_cache.py
@@ -7,37 +7,37 @@ import lib
 lib.setup_env()
 
 from common.xmpp import NS_MUC, NS_PING, NS_XHTML_IM
-from common import caps
+from common import caps_cache as caps
 from common.contacts import Contact
 
 from mock import Mock
 
-		
-class CommonCapsTest(unittest.TestCase):	
-	
+
+class CommonCapsTest(unittest.TestCase):
+
 	def setUp(self):
 		self.caps_method = 'sha-1'
 		self.caps_hash = 'm3P2WeXPMGVH2tZPe7yITnfY0Dw='
 		self.client_caps = (self.caps_method, self.caps_hash)
-		
+
 		self.node = "http://gajim.org"
 		self.identity = {'category': 'client', 'type': 'pc', 'name':'Gajim'}
 
 		self.identities = [self.identity]
 		self.features = [NS_MUC, NS_XHTML_IM] # NS_MUC not supported!
-		
+
 		# Simulate a filled db
 		db_caps_cache = [
 				(self.caps_method, self.caps_hash, self.identities, self.features),
 				('old', self.node + '#' + self.caps_hash, self.identities, self.features)]
 		self.logger = Mock(returnValues={"iter_caps_data":db_caps_cache})
-		
+
 		self.cc = caps.CapsCache(self.logger)
 		caps.capscache = self.cc
-			
-			
+
+
 class TestCapsCache(CommonCapsTest):
-	
+
 	def test_set_retrieve(self):
 		''' Test basic set / retrieve cycle '''
 
@@ -54,18 +54,18 @@ class TestCapsCache(CommonCapsTest):
 		identity = identities[0]
 		self.assertEqual('client', identity['category'])
 		self.assertEqual('pc', identity['type'])
-		
+
 	def test_set_and_store(self):
 		''' Test client_caps update gets logged into db '''
-		
+
 		item = self.cc[self.client_caps]
 		item.set_and_store(self.identities, self.features)
-		
+
 		self.logger.mockCheckCall(0, "add_caps_entry", self.caps_method,
 				self.caps_hash, self.identities, self.features)
-		
+
 	def test_initialize_from_db(self):
-		''' Read cashed dummy data from db ''' 
+		''' Read cashed dummy data from db '''
 		self.assertEqual(self.cc[self.client_caps].status, caps.NEW)
 		self.cc.initialize_from_db()
 		self.assertEqual(self.cc[self.client_caps].status, caps.CACHED)
@@ -74,12 +74,12 @@ class TestCapsCache(CommonCapsTest):
 		''' Make sure that preload issues a disco '''
 		connection = Mock()
 		client_caps = caps.ClientCaps(self.caps_hash, self.node, self.caps_method)
-				
+
 		self.cc.query_client_of_jid_if_unknown(connection, "test@gajim.org",
 				client_caps)
-		
+
 		self.assertEqual(1, len(connection.mockGetAllCalls()))
-		
+
 	def test_no_preload_query_if_cashed(self):
 		''' Preload must not send a query if the data is already cached '''
 		connection = Mock()
@@ -88,9 +88,9 @@ class TestCapsCache(CommonCapsTest):
 		self.cc.initialize_from_db()
 		self.cc.query_client_of_jid_if_unknown(connection, "test@gajim.org",
 				client_caps)
-	
+
 		self.assertEqual(0, len(connection.mockGetAllCalls()))
-		
+
 	def test_hash(self):
 		'''tests the hash computation'''
 		computed_hash = caps.compute_caps_hash(self.identities, self.features)
@@ -98,53 +98,52 @@ class TestCapsCache(CommonCapsTest):
 
 
 class TestClientCaps(CommonCapsTest):
-	
+
 	def setUp(self):
 		CommonCapsTest.setUp(self)
-		self.client_caps = caps.ClientCaps(self.caps_hash, self.node, self.caps_method) 
-		
+		self.client_caps = caps.ClientCaps(self.caps_hash, self.node, self.caps_method)
+
 	def test_query_by_get_discover_strategy(self):
-		''' Client must be queried if the data is unkown '''	
+		''' Client must be queried if the data is unkown '''
 		connection = Mock()
 		discover = self.client_caps.get_discover_strategy()
-		discover(connection, "test@gajim.org")	
-		
-		connection.mockCheckCall(0, "discoverInfo", "test@gajim.org", 
+		discover(connection, "test@gajim.org")
+
+		connection.mockCheckCall(0, "discoverInfo", "test@gajim.org",
 				"http://gajim.org#m3P2WeXPMGVH2tZPe7yITnfY0Dw=")
-		
+
 	def test_client_supports(self):
 		self.assertTrue(caps.client_supports(self.client_caps, NS_PING),
 				msg="Assume supported, if we don't have caps")
-		
+
 		self.assertFalse(caps.client_supports(self.client_caps, NS_XHTML_IM),
 			msg="Must not assume blacklisted feature is supported on default")
-		
+
 		self.cc.initialize_from_db()
-		
+
 		self.assertFalse(caps.client_supports(self.client_caps, NS_PING),
 				msg="Must return false on unsupported feature")
-		
+
 		self.assertTrue(caps.client_supports(self.client_caps, NS_XHTML_IM),
 				msg="Must return True on supported feature")
-		
+
 		self.assertTrue(caps.client_supports(self.client_caps, NS_MUC),
 				msg="Must return True on supported feature")
-			
 
-class TestOldClientCaps(TestClientCaps):	
+
+class TestOldClientCaps(TestClientCaps):
 
 	def setUp(self):
 		TestClientCaps.setUp(self)
-		self.client_caps = caps.OldClientCaps(self.caps_hash, self.node) 
-	
+		self.client_caps = caps.OldClientCaps(self.caps_hash, self.node)
+
 	def test_query_by_get_discover_strategy(self):
-		''' Client must be queried if the data is unknown '''	
+		''' Client must be queried if the data is unknown '''
 		connection = Mock()
 		discover = self.client_caps.get_discover_strategy()
-		discover(connection, "test@gajim.org")	
-		
-		connection.mockCheckCall(0, "discoverInfo", "test@gajim.org")
+		discover(connection, "test@gajim.org")
 
+		connection.mockCheckCall(0, "discoverInfo", "test@gajim.org")
 
 if __name__ == '__main__':
 	unittest.main()
diff --git a/test/unit/test_contacts.py b/test/unit/test_contacts.py
index 3cd4d5110..ecfe793c8 100644
--- a/test/unit/test_contacts.py
+++ b/test/unit/test_contacts.py
@@ -6,10 +6,10 @@ import unittest
 import lib
 lib.setup_env()
 
-from common.contacts import CommonContact, Contact, GC_Contact, Contacts
+from common.contacts import CommonContact, Contact, GC_Contact, LegacyContactsAPI
 from common.xmpp import NS_MUC
 
-from common import caps
+from common import caps_cache
 
 class TestCommonContact(unittest.TestCase):
 	
@@ -23,11 +23,11 @@ class TestCommonContact(unittest.TestCase):
 		Test the caps support method of contacts.
 		See test_caps for more enhanced tests.
 		'''
-		caps.capscache = caps.CapsCache()
+		caps_cache.capscache = caps_cache.CapsCache()
 		self.assertTrue(self.contact.supports(NS_MUC),
 			msg="Must not backtrace on simple check for supported feature")
 		
-		self.contact.client_caps = caps.NullClientCaps()
+		self.contact.client_caps = caps_cache.NullClientCaps()
 					
 		self.assertTrue(self.contact.supports(NS_MUC),
 			msg="Must not backtrace on simple check for supported feature")
@@ -68,7 +68,7 @@ class TestGC_Contact(TestCommonContact):
 class TestContacts(unittest.TestCase):
 	
 	def setUp(self):
-		self.contacts = Contacts()
+		self.contacts = LegacyContactsAPI()
 		
 	def test_create_add_get_contact(self):
 		jid = 'test@gajim.org'
diff --git a/test/unit/test_gui_interface.py b/test/unit/test_gui_interface.py
index 57b91ad4b..d4f1ef4a4 100644
--- a/test/unit/test_gui_interface.py
+++ b/test/unit/test_gui_interface.py
@@ -1,3 +1,6 @@
+'''
+Some diverse tests covering functionality in the GUI Interface class.
+'''
 import unittest
 
 import lib
@@ -13,7 +16,7 @@ gajim.logger = MockLogger()
 
 from gui_interface import Interface
 
-class Test(unittest.TestCase):
+class TestInterface(unittest.TestCase):
 
 	def test_instantiation(self):
 		''' Test that we can proper initialize and do not fail on globals '''
diff --git a/test/unit/test_protocol_caps.py b/test/unit/test_protocol_caps.py
new file mode 100644
index 000000000..f2c7ae509
--- /dev/null
+++ b/test/unit/test_protocol_caps.py
@@ -0,0 +1,75 @@
+'''
+Tests for caps network coding
+'''
+import unittest
+
+import lib
+lib.setup_env()
+
+from common import caps_cache
+from common.protocol import caps
+from common.contacts import Contact
+
+from mock import Mock
+
+from common.xmpp import simplexml
+from common.xmpp import protocol
+
+class TestableConnectionCaps(caps.ConnectionCaps):
+
+	def __init__(self, *args, **kwargs):
+		self._mocked_contacts = {}
+		caps.ConnectionCaps.__init__(self, *args, **kwargs)
+
+	def _get_contact_or_gc_contact_for_jid(self, jid):
+		"""
+		Overwrite to decouple form contact handling
+		"""
+		if jid not in self._mocked_contacts:
+			self._mocked_contacts[jid] = Mock(realClass=Contact)
+			self._mocked_contacts[jid].jid = jid
+		return self._mocked_contacts[jid]
+
+	def discoverInfo(self, *args, **kwargs):
+		pass
+
+	def get_mocked_contact_for_jid(self, jid):
+		return self._mocked_contacts[jid]
+
+
+class TestConnectionCaps(unittest.TestCase):
+
+	def test_capsPresenceCB(self):
+		jid = "user@server.com/a"
+		connection_caps = TestableConnectionCaps("account",
+			self._build_assertering_dispatcher_function("CAPS_RECEIVED", jid),
+			Mock(), caps_cache.create_suitable_client_caps)
+
+		xml = """<presence from='user@server.com/a' to='%s' id='123'>
+						<c node='http://gajim.org' ver='pRCD6cgQ4SDqNMCjdhRV6TECx5o='
+							hash='sha-1' xmlns='http://jabber.org/protocol/caps'/>
+					</presence>
+				""" % (jid)
+		iq = protocol.Iq(node=simplexml.XML2Node(xml))
+		connection_caps._capsPresenceCB(None, iq)
+
+		self.assertTrue(self._dispatcher_called, msg="Must have received caps")
+
+		client_caps = connection_caps.get_mocked_contact_for_jid(jid).client_caps
+		self.assertTrue(client_caps, msg="Client caps must be set")
+		self.assertFalse(isinstance(client_caps, caps_cache.NullClientCaps),
+			msg="On receive of proper caps, we must not use the fallback")
+
+	def _build_assertering_dispatcher_function(self, expected_event, jid):
+		self._dispatcher_called = False
+		def dispatch(event, data):
+			self.assertFalse(self._dispatcher_called, msg="Must only be called once")
+			self._dispatcher_called = True
+			self.assertEqual(expected_event, event)
+			self.assertEqual(jid, data[0])
+		return dispatch
+	
+if __name__ == '__main__':
+	unittest.main()
+
+# vim: se ts=3:
author	Yann Leboulanger <asterix@lagaule.org>	2010-01-19 18:37:14 +0300
committer	Yann Leboulanger <asterix@lagaule.org>	2010-01-19 18:37:14 +0300
commit	3a76966c1462bcd65cee534a06dad4c9fc7cc494 (patch)
tree	b9b4b257e02f9db2d209ec42ea57b481f1239ef5
parent	b38249c4066cf883ceb347b15410d32bd7e3357b (diff)
parent	daf73408d7dbd5324cab1ad7ea4aaec2cb696aaa (diff)